New Project WPF added
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Program.cs