Cabinets in the corner now can't block hallways.

Note this placement is a place holder for better layouts.
Merge branch 'master' of https://github.com/AstroTeam/Game

Conflicts:
	astro_demo/src/Map.cpp