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

Conflicts:
	test.txt