Review changes for pull request #314
Fixing whitespace for #314

Conflicts:
	web-app/js/portal/filter/FilterPanel.js
Code changes for #314