removed giant comment in ComboFilter, now using String.format
Merge branch 'issue_508' of github.com:aodn/aodn-portal into issue_508

Conflicts:
	web-app/js/portal/filter/ComboFilter.js