Merge branch 'feature/eventAmenities' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Oct 2016 15:31:14 +0000 (11:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Oct 2016 15:31:14 +0000 (11:31 -0400)

Trivial merge