F: Add additional fields
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
R: layout inputs
R: layout
R: layout
F: add manufacturers
B: close tag
R: remove tabs
F: add edit icon for vessels
F: add edit icon
F: add edit icon
F: provide manufacturer with autocomplete
F: add autocomplete datalist
F: add manufacturers
F: Fix manufacturer tags and add table stripes
F: Fix tags for manufacturer
F: parse manufacturer
F: Fill model values correctly
F: preselect vessel type