SImple input implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/MainForm.cs
Merge fix