made some changes to Login, Logout methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/AddServerImpl.java