Improved scheduler
Merge branch 'scheduler' of https://github.com/cirope/libreunir into scheduler
Merge branch 'scheduler' of https://github.com/cirope/libreunir into scheduler

Conflicts:
	app/assets/stylesheets/application.css