fixing active admin
fixing active admin
Merge branch 'master' into active_admin
Merge pull request #15 from dmitryshilin/active_admin

Active admin