Added Active Admin
Merged into Branch