gemfile update
Merge branch 'activeadmin_devise_cancan'