fleet 5 update
Merge branch 'master' of https://github.com/GoodGameIndustries/SpaceCraft-v1.0

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi