Merge branch 'feature/lauryAdminPolishing' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 20 Apr 2017 14:25:08 +0000 (10:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 20 Apr 2017 14:25:08 +0000 (10:25 -0400)

Trivial merge