Added active admin
Fixed merge conflicts and added Bootstrap sass