file from srv with local text
Merge branch 'develop' of https://github.com/alexl79/test into develop

Conflicts:
	fileFromSrv