Merge branch 'hotfix/hf1'
Merge branch 'develop'
feature1
feature1
hf2
Merge branch 'hotfix/hf2' into feature/feature1

Conflicts:
	f1.txt
feature1