upd
Merge branch 'master' into develop
Merge branch 'master' of github.com:sergey-melnychuk/git-sandbox into develop
upd
Merge branch 'master' into develop

Conflicts:
	conflict.txt
tests