made some changes
Merge branch 'HEAD' of https://github.com/molyusq/labs-is.git

Conflicts:
	src/ua/kpi/fpm/pzks/is/labs/lisevych_zhuk/FtpResource.java