Merge remote-tracking branch 'origin/master' into scalable
auto load boat position
Merge remote-tracking branch 'origin/master' into scalable

Conflicts:
	tugboating.js
timer
fixed map token generator?
merged with master