Merge tag 'v1.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 Sep 2014 15:23:40 +0000 (11:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 Sep 2014 15:23:40 +0000 (11:23 -0400)
V1.0


Trivial merge