Add filter module
Fix bug
Merge branch 'ac-filter' into js-integration

Conflicts:
	core.js
Add filter