Working password reset
Merge pull request #19 from LocalData/pw-reset

Working password reset
Merge branch 'master' into settings

Conflicts:
	test/test.users.js