inté home
update profile and update-profile pages
add logout and update profile buttons
Merge branch 'dev' into feature/rouksana
update gemifle
Merge branch 'master' into feature/amilti
Merge branch 'feature/tony' into feature/amilti

Conflicts:
	app/assets/javascripts/ng-app/app.js
	app/assets/javascripts/ng-app/controllers/agenda.js
	app/assets/javascripts/ng-app/controllers/profile.js
Merge branch 'dev' into feature/amilti

Conflicts:
	Gemfile
fix bug