Merge branch 'develop' into feature/dashboard
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Sep 2016 14:15:08 +0000 (10:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Sep 2016 14:15:08 +0000 (10:15 -0400)

Trivial merge