Update admin controllers to permit attributes
Merge branch 'activeadmin'