0.0.1.6

build ships
0.0.1.6
Merge branch 'master' of https://github.com/ansaloy/Galaxy-Strike

Conflicts:
	Galaxy Strike/Assets/Save/start.txt
	Galaxy Strike/Galaxy Strike-csharp.sln
	Galaxy Strike/Galaxy Strike.sln
	Galaxy Strike/Library/CurrentLayout.dwlt
	Galaxy Strike/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Galaxy Strike/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Galaxy Strike/Library/ScriptAssemblies/Assembly-CSharp.dll
	Galaxy Strike/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Galaxy Strike/Library/assetDatabase3
	Galaxy Strike/Library/expandedItems
	Galaxy Strike/Library/metadata/12/12e164431dbd8714bbde0aeef453b764
	Galaxy Strike/Library/metadata/27/27275fc7df2ec0346ba12831e6a01345
	Galaxy Strike/Library/metadata/37/37590480333382341b5007dec2a032c6
	Galaxy Strike/Library/metadata/7b/7bb4288e64d13144d89313c9243cdac6
	Galaxy Strike/Library/metadata/7d/7dda28b6d1f6745ef8406a8aaa787f3d
	Galaxy Strike/Library/metadata/bc/bc1b6a2bc000c40bd9d3dfdcda41c9ec
	Galaxy Strike/Library/metadata/d9/d9a637e69b9f0a7449ee6b6e158ddd5b
	Galaxy Strike/Library/metadata/ec/ec268c3ea1baceb4abb2168daed86f68
	Galaxy Strike/Library/metadata/f5/f5113c98080bb184d835a557de2235f3