Main changes before deploy
Merge pull request #1 from fladson/active_admin

Main changes before deploy