bug fixes
Merge branch 'master' of https://github.com/mikedice/CampGoodtimesWebSpa
Merge branch 'master' of https://github.com/mikedice/CampGoodtimesWebSpa