update calendar route
Merge branch 'feature/rouksana' into dev

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