high search results
Merge remote-tracking branch 'github/master'

Conflicts:
	halite/app/view/console.html