Merge branch 'DDBNEXT-1031-hla-facebookhttps' into release/4.2
changed order of icons in view (so that info-icon appears last)
Merge branch 'DDBNEXT-1040-BAG' into develop

Conflicts:
	grails-app/controllers/de/ddb/next/FavoritesController.groovy
	grails-app/views/search/_thumbnailWrapper.gsp