Test 2
Merge branch 'develop' of https://github.com/eskatos/yooz-git into develop

Conflicts:
	test2