Active Admin tests passing
Merged successfully with master