new maps
Merge branch 'master' of https://github.com/franklen/boxgohome

Conflicts:
	Resources/maps/nmap_40.tmx