Added trimming for year and edition (with unit tests).
Merge branch 'master' of github.com:codecentric/worblehat-1 into WB_115