new feature developed
Merge branch 'release1' into dev

Conflicts:
	file1.txt
new feature developed
hotfix 2