Syncing up with home
Merge branch 'master' of https://github.com/Mark104/ProjectDawn

Conflicts:
	ProjectDawn/Client/Client-csharp.sln
	ProjectDawn/Client/Client.sln
	ProjectDawn/Client/Client.userprefs
	ProjectDawn/Client/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	ProjectDawn/Client/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	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/a7/a78d203242e77fa4ea14d69f418bbf6a
	ProjectDawn/Client/Library/metadata/ff/ffb2c9bd27f47ed44a6d4aed36f6fa82
Merge branch 'master' of https://github.com/Mark104/ProjectDawn
Work sync, improved game listing a bit, starting adding dedicated behavior to servers.