Merge pull request #22 from confpub/master

some more room assignments
New session order, according to table of contents in the proceedings, and to location