F: Add additional fields
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/templates/gpsoffset-de.handlebars
	src/js/templates/gpsoffset-en.handlebars
	src/js/templates/vesselgeneric-de.handlebars
	src/js/templates/vesselgeneric-en.handlebars
	src/js/templates/wizard.handlebars