add model and first config
Add f301, f302, bc304 and railgun, spawn bullets before moving
Merge branch 'master' into daedalus

Conflicts:
	src/equipment/weapons/rocketlauncher.cpp
	src/game.cpp
	src/gamestate/gameplay/running/gameplayrunninginput.cpp
	src/main.cpp
	src/resource/colorcoder.h
	src/scenarios/gamescenario.cpp
	src/worldobject/worldobjectcomponents.cpp
Some merge leftovers
Double bc304 size
Add DEG properties, remove monoblit, model updates
Merge branch 'master' into daedalus, fix colors

Conflicts:
	src/scenarios/frozengamescenario.cpp
Merge branch 'master' into daedalus
use regex for floatConverter
Merge branch 'master' into daedalus

Conflicts:
	src/property/propertymanager.cpp
pirate fleed
Merge pull request #455 from voxelinc/daedalus

Army Fleet
Add priatescenario to F list
Merge pull request #468 from voxelinc/pirates

Pirates enter the Master =)
Merge branch 'master' of https://github.com/voxelinc/voxellancer into scripting

Conflicts:
	src/gamestate/gameplay/gameplay.cpp
	src/world/worldlogic.cpp