Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Mar 2017 17:38:40 +0000 (13:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Mar 2017 17:38:40 +0000 (13:38 -0400)

Trivial merge