Filters based on text in search box
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/popup.js