Merge pull request #89 from confpub/master

ICSE update
shorten up names (looks better on small devices)
ICSE: Room assignment