Fixed Javascript issues caused by merge; got rid of r:layoutResources that was causing tabs to not work.
Merge remote-tracking branch 'refs/remotes/thomson/master' into imperial.fs

Conflicts:
	grails-app/views/search/list.gsp
	web-app/js/maintabpanel.js