solving merging conflicts
Language bug in the header fixed.
Merge branch 'DDBNEXT-7' into DDBNEXT-17_2

Conflicts:
	grails-app/views/_mainHeader.gsp
	web-app/js/advanced-search-page.js
	web-app/js/large-cookie.js