[fix] merge issues
Merge remote-tracking branch 'origin/wow-develop' into wow-develop

Conflicts:
	public/js/map.js