updates
Merge branch 'master' of https://github.com/vladnis/travel-helper-client

Conflicts:
	IOC_proj/src/comunication/ServerTask.java