search ready
Merge branch 'master' of https://github.com/Hackstore/hackstore

Conflicts:
	hackstore/smart.json
	hackstore/smart.lock