Update file1
Merge branch 'master' into branch1

Conflicts:
	file1
Merge branch 'branch1'