Merge tag 'v1.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 11 Nov 2015 14:16:00 +0000 (09:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 11 Nov 2015 14:16:00 +0000 (09:16 -0500)
v1.0


Trivial merge