Hack Info
Merge branch 'master' of https://github.com/Hackstore/hackstore

Conflicts:
	hackstore/server/methods.js
	hackstore/smart.json
	hackstore/smart.lock
Deleted Demo