Merge branch 'release/1.0' V1.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 14:15:32 +0000 (10:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 14:15:32 +0000 (10:15 -0400)

Trivial merge