Merge pull request #2 from SinaC/master

Refactoring + bug fixed
refactoring
Include a new project : ClientWPF + Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Program.cs
New Project WPF added
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Program.cs
Merged upstream/master conflict