Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
refs #74 move the devise files to admin/users directory