intergrate active admin
Merge branch 'admin'