27/07
Merge remote-tracking branch 'origin/master'

Conflicts:
	P2PlayDesktop.v12.suo
	P2PlayDesktop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	P2PlayDesktop/obj/Debug/P2PlayDesktop.csproj.FileListAbsolute.txt