Add suicidetask
Merge branch 'flyto' into suicide
Merge branch 'flyto' into suicide

Conflicts:
	src/worldobject/weapons/rocket.cpp
Merge branch 'master' into suicide

Conflicts:
	src/worldobject/weapons/rocket.cpp
don't distinguish aitasks #317
Merge branch 'master' into suicide

Conflicts:
	src/ai/basictask.cpp
	src/ai/boardcomputer.cpp
Add formation basics
Add handling of leader destruction
Set formationpoint + speed
Add FormationUp
Merge branch 'master' into suicide

Conflicts:
	data/config.ini
	src/ai/elevatedtasks/patrolwaypointstask.cpp
	src/gamescenario.cpp
Tweaking
More generous minAct values
Merge branch 'master' into suicide

Conflicts:
	data/config.ini
	src/scenarios/gamescenario.cpp
	src/ui/inputhandler.cpp
	src/utils/simplewayfind.cpp
	src/worldobject/ship.cpp
	src/worldobject/ship.h
	src/worldobject/weapons/rocket.cpp
	src/worldobject/weapons/rocket.h
	src/worldobject/weapons/rocketlauncher.cpp
Merge branch 'suicide' of https://github.com/voxelinc/voxellancer into demo_05022014

Conflicts:
	src/scenarios/gamescenario.cpp
fix scenario
Merge branch 'demo_05022014' of https://github.com/voxelinc/voxellancer into demo_05022014

Conflicts:
	src/scenarios/demoscenario.cpp