Introduce the new icons set.
Change structure of scenarios so that we have named categories at the vessel level
Merge branch 'features/ian/new_icons'

Conflicts:
	www/js/game/scenarios/1a_drive_vessel.json