Merge pull request #58 from confpub/master

FSE'13: final version
Room and chairs updated