update to activeadmin - include HABTM associations and new models