Developing room 2
Merge branch 'dev' into feature-dan-dev

Conflicts:
	js/maps.js
Merge branch 'dev' into feature-dan-dev
Room 2 Development. Added debug link and placed doctors around room.
Merge branch 'dev' into feature-dan-dev
Merge branch 'dev' of github.com:shawkinsl/ProjectBlock into feature-dan-dev