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