Add alert maintController
Change name method
Merge branch 'master' of https://github.com/vpoulain/alveolus-frontend

Conflicts:
	app/js/controllers/mainCtrl.js
Update authentication system : token !
Merge branch 'master' of https://github.com/vpoulain/alveolus-frontend

Conflicts:
	app/index.html
	app/js/controllers/mainCtrl.js