Initial integration of faceted search capabilities
Merge remote-tracking branch 'origin/master'

Conflicts:
	CHARMe_plugin/src/plugin/js/charme.logic.js
	CHARMe_plugin/src/plugin/js/charme.web.controllers.js
	CHARMe_plugin/src/plugin/templates/listannotations.html