0.0.2.3
Merge branch 'master' of https://github.com/ansaloy/Galaxy-Strike

Conflicts:
	Galaxy Strike/Galaxy Strike-csharp.sln
	Galaxy Strike/Galaxy Strike.sln
	Galaxy Strike/Galaxy Strike.userprefs
	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/e3/e346d5efe39b34a50bbef330bec095b3