change password fix
Merge branch 'master' of https://github.com/avinashega/loginsystem

Conflicts:
	app/services/users.js