Created new rooms using the new tmx maps
Merge branch 'dev' of https://github.com/verath/ESCP into dev
Merge branch 'dev' of https://github.com/verath/ESCP into dev