Merge branch 'master' into develop
rails generate devise:views admin
Merge branch 'develop' of https://github.com/doyomeki/matsuri2 into develop
refs #74 move the devise files to admin/users directory
refs #25 'rails generate migration AddDeletedAtToEntries deleted_at:timestamp'
refs #25 add 'acts_as_paranoid' to entry table
refs #73 add list of users
refs #73 add admin menu
refs #72 edit user profile, but current user logout
chnage layout users_link