Updated map to a more offical one
Merge branch 'master' of https://github.com/reytiger/SAR

Conflicts:
	SAR/src/map/Map.java