Enable 'admin'
Merge branch 'develop' of github.com:mohamedmagdy/boiler_plate into develop