example: filter
Merge branch 'develop'

Conflicts:
	js/controllers/cpuCtrl.js