Merge branch 'master' of https://github.com/rene-anderes/edu.git

Conflicts:
	jpa-spring/src/test/java/org/anderes/edu/jpa/application/RecipeControllerTest.java