User + controller webapp
Merge branch 'master' of https://github.com/vpoulain/alveolus-frontend

Conflicts:
	app/js/controllers/webappCtrl.js