Merge branch 'develop' into feature/dashboard
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 14:43:59 +0000 (10:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Sep 2016 14:43:59 +0000 (10:43 -0400)

Trivial merge