Merge branch 'master' of https://github.com/codecentric/worblehat-frauenpower
Merge branch 'master' of https://github.com/codecentric/worblehat-frauenpower
Conflict fix
fixed conflicts in pom
added Javadoc comments to StandardBoorowBookController