map updates
Merge branch 'sprint2' of https://github.com/eliw00d/Paris into sprint2

Conflicts:
	MHCS/war/MHCS.css