Merge branch 'feature/amenityGroups' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Jun 2016 13:30:39 +0000 (09:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Jun 2016 13:30:39 +0000 (09:30 -0400)

Trivial merge