filter tab fixes and styling from bug 311
changes after review
Merge branch 'master' into bug-311
Merge branch 'master' into bug-311

Conflicts:
	grails-app/views/home/index.gsp
#311 Revert wrongly committed config/datasource files. Code formatting changes
some jasmine test fixes after merge of 1-2-3
Merge branch 'master' into bug-311

Conflicts:
	web-app/js/portal/lang/en.js
Merge branch 'master' into bug-311

Fix conflicts:
	web-app/js/portal/lang/en.js