Map modification

Expanded/rearranged map
Merge remote-tracking branch 'origin/master'

Conflicts:
	map.js