filters working
Merge branch 'master' of github.com:asascience-open/comt-ui

Conflicts:
	main.js