Merge tag 'v1.0.0' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 12:40:12 +0000 (08:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 28 Jun 2017 12:40:12 +0000 (08:40 -0400)
rolling develop changes into master after testing file upload on dev55


Trivial merge