another current
Merge branch 'master' of https://github.com/SeaVorg/GP

Conflicts:
	map.js