+featureStudy1
Merge branch 'feature/featureStudy1' into develop

Conflicts:
	test.txt