Merge branch 'develop' into feature/lauryAdminPolishing
authorLaury GvR <laury@gaslightmedia.com>
Mon, 3 Oct 2016 19:40:37 +0000 (15:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 3 Oct 2016 19:40:37 +0000 (15:40 -0400)

Trivial merge