merge
Merge branch 'supermaster' of https://github.com/jhilscher/SCM_Kap5_Tool into supermaster

Conflicts:
	ToolFahrrad-v1/Design/ToolFahrrad.resx