data-vis data filtering work in progress
Merge branch 'master' of github.com:openforis/calc

Conflicts:
	calc-webapp/src/main/webapp/js/calc/calc.js