Merge
Merging
Bugs in active admin solved