pushing active admin to production
Merge branch 'master' of github.com:venelrene/HatGame

merging with admin branch and master