refactored

refactoring + small changes
Revert "refactored"

This reverts commit 0c94b3969c1b2f1d1a9f0451f6b6b7a7d90a23ef.
Ref

small changes
Merge remote-tracking branch 'origin/Refactor' into Dev

Conflicts:
	Client/Client/LogOnWindow.xaml.cs