Merged in The Hood's new ships from Standard.
Initial ship changes for hull/hold model
Merge branch 'holdships' of git://github.com/calvin-fisher/simutrans-pak128.britain.git into water-transport-overhaul

Conflicts:
	text/en.tab
REVERT: Changes to parameter.mos
CODE: Update project file for new boats
FIX: Builder's yard graphic
ADD: Caledonian MacBryne Island, Loch and Super Loch class boats (Kieron Green)
Merge branch 'master' into water-transport-overhaul

Conflicts:
	Pak128.Britain-Experimental.suo
	Pak128.Britain-Experimental.vcxproj
	compat.tab
Trivial commit
Merge branch 'water-transport-overhaul'

Conflicts:
	Pak128.Britain-Experimental.suo
	Pak128.Britain-Experimental.vcxproj
	boats/boats192/blackwall-frigate.dat
	boats/boats192/clipper.dat
	boats/boats192/east-indiaman.dat
	compat.tab
FIX: Minor graphical error in 3rd and 4th rail electrification buttons