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

Conflicts:
	app/partials/user.html