Registration and login
Merge branch 'master' of https://github.com/Hackstore/hackstore

Conflicts:
	hackstore/hackstore.js
	hackstore/lib/router.js