Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceCOG Client/Assets/Sprites/Thumbs.db.meta
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/expandedItems
	SpaceCOG Client/Library/guidmapper
	SpaceCOG Client/Library/metadata/5d/5dc9f3bdf075f4e40924936435e96ef5
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln
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
Added a player ship
Standard Unity Whatsits that it does for some reason
Random commit because I need to sync my remote master to merge
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
Revert "Merge branch 'Ui-and-Sprites'"

This reverts commit b0146b839a9fff0615b37cc8be8e92e795691237, reversing
changes made to 02525bf5bc3e2e0535b14780cb8355293f4f9ff4.
Merge branch 'master' into networking

Conflicts:
	SpaceCOG Client/Library/CurrentLayout.dwlt
	SpaceCOG Client/Library/InspectorExpandedItems.asset
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpaceCOG Client/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpaceCOG Client/Library/assetDatabase3
	SpaceCOG Client/Library/expandedItems
	SpaceCOG Client/Library/guidmapper
	SpaceCOG Client/Library/metadata/03/0322d5b52c100c844be4713c8d79720b
	SpaceCOG Client/SpaceCOG Client-csharp.sln
	SpaceCOG Client/SpaceCOG Client.sln
	SpaceCOG Client/SpaceCOG Client.userprefs