Several small fixes in docs
Merge branch 'v2.0-fixes' into v2.0
Fixed mem leak for shortcut vessels

(cherry picked from commit ab117d7971919ecf4b8d1499d9290ba944354a28)

Conflicts:
	src/vesselbase/ActionWithVessel.cpp
Merge branch 'v2.0' into v2.1

Conflicts:
	src/vesselbase/ActionWithVessel.cpp