login addded

dfad
Merge branch 'serv_connector' of https://github.com/Pilgi/test into serv_connector

dfad

Conflicts:
	src/s/client.java