fixed routing merge
fixed routing merge
added activeadmin
added activeadmin