Merge tag 'v1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Jul 2014 20:25:54 +0000 (16:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Jul 2014 20:25:54 +0000 (16:25 -0400)
Version 1.0


Trivial merge