feature/sami update login redirection
Merge branch 'feature/amilti' into dev
Merge branch 'dev' of ssh://github.com/Rayderxx/appli-campus into feature/amilti
calendar fr
Merge branch 'feature/rouksana' into dev

Conflicts:
	.DS_Store
	app/assets/javascripts/ng-app/controllers/agenda.js
	app/assets/templates/agenda.html.erb
fix merge
Merge branch 'dev' of ssh://github.com/Rayderxx/appli-campus into feature/amilti
feature/sami fix bug
merge
Merge branch 'feature/amilti' into dev

Conflicts:
	Gemfile
	app/assets/javascripts/ng-app/controllers/agenda.js
feature/rouksana add agenda
feature/rouksana fix bug
fix
update calendar route
Merge branch 'feature/rouksana' into dev

Conflicts:
	app/assets/javascripts/ng-app/controllers/agenda.js
fix agenda.js
change api url
Merge branch 'dev' into feature/tony

Conflicts:
	app/assets/javascripts/ng-app/app.js
	app/assets/javascripts/ng-app/controllers/agenda.js
change api url
fix migration