migration update
Merge branch 'activeadmin_devise_cancan_2'