feature1
feature2
feature12
Merge branch 'feature2' into develop
Merge branch 'feature12' into develop

Conflicts:
	master1