stash
stas
bump
Merge branch 'client_auth'
user auth
Merge branch 'active_admin'
add all the controllers