better selects and other fixes
Merge branch 'develop' of github.com:42Zavattas/intra into develop

Conflicts:
	app/scripts/controllers/modal-admin.js