With DB capabilities
Merge branch 'master' of https://github.com/elbalu/sharehands

Conflicts:
	app.js
Merge branch 'master' of https://github.com/elbalu/sharehands

Conflicts:
	app.js