Merge pull request #30 from confpub/master

Room assignments ICSE
Schedule changes by Jo integrated