изменения на сервере
Merge branch 'master' of https://github.com/IUdalov/java-remote-shell

Conflicts:
	Client/build/built-jar.properties
	Client/nbproject/private/private.properties