Activeadmin

Updated to master