hshs
Merge branch 'master' into feature/testing_2
Merge branch 'feature/testing_2' into develop

Conflicts:
	Test2.txt