Cleanup
Merge branch '01' into 02
Merge and cleanup
Merge branch '02' into 03
Merge and cleanup
Fixed wrong recipe number
Merge branch '03' into 04

Conflicts:
	pom.xml
Merge and cleanup