added easier placeholders to test
added easier placeholders to test
Merge branch 'master' into generic_calendar
Merge branch 'generic_calendar'
Function to filter rooms by proposal and schedule block
added mockenrollments
Merge pull request #153 from se1-1314/mock-enrollments

added mockenrollments
Fixed free rooms code
Merge remote-tracking branch 'origin/master' into nilsbranch
Query: possible free rooms for a new schedule-block
API for free rooms for block