Merge branch 'development'
Merge branch 'candidate'
incremented version
Merge branch 'fixes' into development

Conflicts:
	myclass.h