Merge branch 'dev' of ssh://github.com/Rayderxx/appli-campus into feature/amilti
Merge branch 'dev' of ssh://github.com/Rayderxx/appli-campus into feature/amilti
feature/sami fix bug
Merge branch 'feature/amilti' into dev

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