created conflict in master 2
Merge branch 'master' into NIBG-123

Conflicts:
	test.txt