Added vessel icons
Merge branch 'master' into vessel-icons
Vessel class lookup
Merge branch 'master' into vessel-icons
New vessel classes
Merge branch 'vessel-icons'

Conflicts:
	js/app/Visualization/BasicSidebar.js