Merge branch 'develop' into feature/dashboard
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Oct 2016 14:35:21 +0000 (10:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 11 Oct 2016 14:35:21 +0000 (10:35 -0400)

Trivial merge