Merge pull request #214 from Verkalets/fix-always

reviews
add admin for user, fix other
Merge pull request #218 from Verkalets/fix_admin

add admin for user, fix other
gemfile