Dock changes 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	simulation/templates/units/viking_warship_skeid.xml