Revert Pratik's changes from master
Merge pull request #247 from kimardenmiller/revert-active-admin-changes

Revert Pratik's changes from master