Merge tag 'v1.0.4' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:15:18 +0000 (12:15 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:15:18 +0000 (12:15 -0400)
Release with Amenities working


Trivial merge