feature 3
develop 6
Merge branch 'feature' into develop

Conflicts:
	file1.h