filter

minified
filter
Merge remote-tracking branch 'origin/demo' into demo

Conflicts:
	app/backand/js/directives/grids/js/grids.js