Minor changes
Merge branch 'master' of https://github.com/krsjan/mapp-at-ifi
Merge branch 'master' of https://github.com/krsjan/mapp-at-ifi
Added dynamic loading of rooms.
Fixed conflicts due to merge