Merge branch 'develop2' into develop

Conflicts:
	test.txt