create feature/myfeat2
edit.004.denen-pc.eclipse43.edit.feature/myfeat2
Merge branch 'feature/myfeat2' into develop

Conflicts:
	memo.txt