proceeding on admin
Merge branch 'develop' of github.com:42Zavattas/intra into develop

Conflicts:
	app/scripts/app.js
	app/views/index.html
	bower.json