some change
add flat to active admin
Merge conflicts with master
Merge pull request #37 from Benoitlecorre/activadmin

Activadmin