finished wizard - no function
Merge branch 'master' of https://github.com/JosefRieseneder/Bloody

Conflicts:
	SourceCode/res/layout/fragment_height.xml
	SourceCode/res/layout/fragment_weight.xml