update profile
merge
Merge branch 'feature/amilti' into dev

Conflicts:
	Gemfile
	app/assets/javascripts/ng-app/controllers/agenda.js