Syning changes
Merge branch 'master' of https://github.com/Mark104/ProjectDawn
Home Commits
Merge branch 'master' of https://github.com/Mark104/ProjectDawn

Conflicts:
	ProjectDawn/Builds/MasterServer_Data/Managed/Assembly-CSharp-firstpass.dll
	ProjectDawn/Builds/MasterServer_Data/Managed/Assembly-CSharp.dll
	ProjectDawn/Builds/MasterServer_Data/Managed/Assembly-UnityScript-firstpass.dll
	ProjectDawn/Builds/MasterServer_Data/PlayerConnectionConfigFile
	ProjectDawn/Builds/MasterServer_Data/mainData
	ProjectDawn/Builds/MasterServer_Data/output_log.txt
	ProjectDawn/Builds/MasterServer_Data/resources.assets
	ProjectDawn/Client/Assembly-CSharp-Editor-firstpass.pidb
	ProjectDawn/Client/Assembly-CSharp-firstpass.pidb
	ProjectDawn/Client/Assembly-CSharp.pidb
	ProjectDawn/Client/Assembly-UnityScript-Editor-firstpass.pidb
	ProjectDawn/Client/Assembly-UnityScript-firstpass.pidb
	ProjectDawn/Client/Assets/Game/Settings/Settings.cs
	ProjectDawn/Client/Client-csharp.sln
	ProjectDawn/Client/Client.sln
	ProjectDawn/Client/Client.userprefs
	ProjectDawn/Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectDawn/Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectDawn/Client/Library/assetDatabase3
	ProjectDawn/Client/Library/expandedItems
	ProjectDawn/Client/Library/guidmapper
	ProjectDawn/Client/Library/metadata/fa/fad7f7c1822f14e4ab436704982642fb
	ProjectDawn/Client/ProjectSettings/EditorBuildSettings.asset
	ProjectDawn/Server/Assembly-CSharp.pidb
	ProjectDawn/Server/Assets/Game/Settings/Settings.cs
	ProjectDawn/Server/Library/EditorUserBuildSettings.asset
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll.mdb
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll.mdb
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	ProjectDawn/Server/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	ProjectDawn/Server/Library/assetDatabase3
	ProjectDawn/Server/Library/expandedItems
	ProjectDawn/Server/Library/guidmapper
	ProjectDawn/Server/Library/metadata/fa/fad7f7c1822f14e4ab436704982642fb
	ProjectDawn/Server/Server-csharp.sln
	ProjectDawn/Server/Server.sln
	ProjectDawn/Server/Server.userprefs