Merge branch 'DDBNEXT-800-Characters200' into develop
Merge branch 'DDBNEXT-960-hla-blockfav' into develop
Merge branch 'DDBNEXT-963-hla-titlemail' into develop
Merge branch 'DDBNEXT-964' into develop
Merge branch 'DDBNEXT-958-hla-floating' into develop
HOTFIX DDBNNEXT-967 due to GIT merge problems
Merge branch 'DDBNEXT-951-bro-2nd' into develop
Merge branch 'DDBNEXT-968-bro' into develop

Conflicts:
	grails-app/controllers/de/ddb/next/FavoritesController.groovy
HTOFIX DDBNEXT-950 due to merge problems with branch
HTOFIX Broken unit test because of changed Folder constructor
Merge branch 'DDBNEXT-965-BOZ' into develop
DDBNEXT-913 Query syntax error message more descriptive
DDBNEXT-913 Typo
Merge branch 'DDBNEXT-913' into release/4.2