develop
Merge branch 'develop' into feature/testFeature3

Conflicts:
	test.txt