Work sync
Merge branch 'master' of https://github.com/Mark104/ProjectDawn

Conflicts:
	ProjectDawn/Client/Client-csharp.sln
	ProjectDawn/Client/Client.sln
	ProjectDawn/Client/Library/expandedItems