Merge branch 'develop' into feature/dashboard
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Oct 2016 16:27:33 +0000 (12:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 18 Oct 2016 16:27:33 +0000 (12:27 -0400)

Trivial merge