feature/rouksana add agenda
fix
update calendar route
Merge branch 'feature/rouksana' into dev

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

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