work sync, possibly un-needed
Merge branch 'master' of https://github.com/Mark104/SpaceBattlefield

Conflicts:
	SpaceBattlefield/Client/Assembly-CSharp.pidb
	SpaceBattlefield/Client/Assets/Game/Scripts/FrontEnd/Controllers/GC_FrontEnd.cs
	SpaceBattlefield/Client/Client-csharp.sln
	SpaceBattlefield/Client/Client.sln
	SpaceBattlefield/Client/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	SpaceBattlefield/Client/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	SpaceBattlefield/Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceBattlefield/Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceBattlefield/Client/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	SpaceBattlefield/Client/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	SpaceBattlefield/Client/Library/assetDatabase3
	SpaceBattlefield/Client/Library/metadata/7d/7dce37401eb414141ad40bcaf2ab6cfa
	SpaceBattlefield/Server/Assembly-CSharp-Editor-firstpass-vs.csproj
	SpaceBattlefield/Server/Assembly-CSharp-Editor-firstpass.csproj
	SpaceBattlefield/Server/Assembly-CSharp-firstpass-vs.csproj
	SpaceBattlefield/Server/Assembly-CSharp-firstpass.csproj
	SpaceBattlefield/Server/Assembly-CSharp-vs.csproj
	SpaceBattlefield/Server/Assembly-CSharp.csproj
	SpaceBattlefield/Server/Assembly-UnityScript-Editor-vs.unityproj
	SpaceBattlefield/Server/Assembly-UnityScript-Editor.unityproj
	SpaceBattlefield/Server/Assembly-UnityScript-firstpass-vs.unityproj
	SpaceBattlefield/Server/Assembly-UnityScript-firstpass.unityproj
	SpaceBattlefield/Server/Library/AssetServerCacheV3
	SpaceBattlefield/Server/Library/ProjectSettings.asset
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll.mdb
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	SpaceBattlefield/Server/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	SpaceBattlefield/Server/Library/assetDatabase3
	SpaceBattlefield/Server/Library/guidmapper
	SpaceBattlefield/Server/Library/metadata/00/0053e79b6058512408e39291255532b6
	SpaceBattlefield/Server/Library/metadata/0c/0c8ea36ef8dda574699b97c833b9003a
	SpaceBattlefield/Server/Library/metadata/0d/0d9b7f9f4a19e854884665a588c7a542
	SpaceBattlefield/Server/Library/metadata/11/1167c0a28d11119930004d8a4241aa39
	SpaceBattlefield/Server/Library/metadata/28/2810b04ce0ff7e448a6ceaea481b7e76
	SpaceBattlefield/Server/Library/metadata/2b/2baeb7b27e08125469ca0657f940967c
	SpaceBattlefield/Server/Library/metadata/2c/2c29c08dd1c0b6749b7cd0fcff7a29fd
	SpaceBattlefield/Server/Library/metadata/30/3034185e53215624da185fc92cc5e11a
	SpaceBattlefield/Server/Library/metadata/39/39e344f3b9214124b8611d709e5a8857
	SpaceBattlefield/Server/Library/metadata/3e/3e69dca290c77d24ebc2d003067026fe
	SpaceBattlefield/Server/Library/metadata/49/498d53afa122ad0408e8cc6809ea8b37
	SpaceBattlefield/Server/Library/metadata/4b/4ba8c4c95c4ec384a96a7da288071d4d
	SpaceBattlefield/Server/Library/metadata/4b/4bb73fe7f5b05e844bda9c6918527537
	SpaceBattlefield/Server/Library/metadata/5c/5c1eb949a92b66546af2eb1c65bab5a4
	SpaceBattlefield/Server/Library/metadata/62/6205c27cc031f4e66b8ea90d1bfaa158
	SpaceBattlefield/Server/Library/metadata/64/641bb2dce818a8a499b537a1963889ac
	SpaceBattlefield/Server/Library/metadata/67/6716f7698879bb84fadda565875f0a1a
	SpaceBattlefield/Server/Library/metadata/69/69680b688d11eb9d30009b3b4241aa39
	SpaceBattlefield/Server/Library/metadata/6d/6d36dfe085e7f0642bd39f430a181ae2
	SpaceBattlefield/Server/Library/metadata/70/70aca81a980d02644a47c438f68e4cfd
	SpaceBattlefield/Server/Library/metadata/77/77873135531293142b169c1646863c1f
	SpaceBattlefield/Server/Library/metadata/7a/7a632f967e8ad42f5bd275898151ab6a
	SpaceBattlefield/Server/Library/metadata/7d/7dd19f028d9551941b4c037dc097876c
	SpaceBattlefield/Server/Library/metadata/85/850952daa18a7b34eb673b6c2f646e36
	SpaceBattlefield/Server/Library/metadata/8c/8c12896afaad058488bfdb2234cab983
	SpaceBattlefield/Server/Library/metadata/8c/8caa437b19957a045866b84c6218a0db
	SpaceBattlefield/Server/Library/metadata/95/95ef4804fe0be4c999ddaa383536cde8
	SpaceBattlefield/Server/Library/metadata/9f/9f9024318d30b734ab4bfad196cb7fc9
	SpaceBattlefield/Server/Library/metadata/a4/a4cdca73d61814d33ac1587f6c163bca
	SpaceBattlefield/Server/Library/metadata/ab/ab70c098a52a04be88096d20e1540cb8
	SpaceBattlefield/Server/Library/metadata/ac/ac96f5c0b697340a887ac2bd77a0bddc
	SpaceBattlefield/Server/Library/metadata/af/af6a803229e53e643b2327221b5ca82b
	SpaceBattlefield/Server/Library/metadata/b9/b96de244eb5578b49a398c02b4b3a4fd
	SpaceBattlefield/Server/Library/metadata/c0/c0cfaad0909e8ea489e8e97249d60531
	SpaceBattlefield/Server/Library/metadata/c3/c373b5eedcf28e944a66cca5db95021c
	SpaceBattlefield/Server/Library/metadata/c8/c8a388ffb9f328c41bf191ca26f34bab
	SpaceBattlefield/Server/Library/metadata/ca/ca67b3eb823765a46a8bc6f55b902614
	SpaceBattlefield/Server/Library/metadata/ea/eac2d19cc8d00484fb29b7b74e0e654d
	SpaceBattlefield/Server/Library/metadata/ed/edae50558d737a94b9df6b69c125d33c
	SpaceBattlefield/Server/Library/metadata/f6/f637a7132ee153f42a6a89229de50aa6
	SpaceBattlefield/Server/Library/metadata/f9/f9be5429cbf387c4f9140f7d1908fb9c
	SpaceBattlefield/Server/Library/metadata/fc/fc00ec05a89da4ff695a4273715cd5ce
	SpaceBattlefield/Server/ProjectSettings/ProjectSettings.asset
	SpaceBattlefield/Server/Server-csharp.sln
	SpaceBattlefield/Server/Server.sln