Trying to update branch
Merge branch 'master' of https://github.com/the-eejay/daredevilgaming into UI-and-Sprites

Conflicts:
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/guidmapper
	SpaceCOG Client/Library/metadata/ac/acc526eb0a1791e4bb0dcc7b4abbba2b
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln
Standard Unity Whatsits that it does for some reason
Merge branch 'Ui-and-Sprites'

Conflicts:
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/expandedItems
	SpaceCOG Client/Library/metadata/b4/b46b765437631c343a7cc1c67d69cd48
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln