Merge tag 'v1.0.6' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Sep 2015 16:35:50 +0000 (12:35 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Sep 2015 16:35:50 +0000 (12:35 -0400)
Fixes to member info categories and amenities


Trivial merge