new
Merge branch 'branch1' into released

Conflicts:
	test.txt