search function checkin (missing cancel search function)
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	css/index.css
	js/core.js
	js/options.js
	modules/wordpressCom/js/wpcom.js
search change