calendar filter timeoffs
minor fixes
placeholders
Merge branch 'master' of github.com:RasoTeam/platform
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/models/course.rb