implement reset password feature
Merge branch 'master' of https://github.com/EVRI-TEAM/Evri_Charity-Portal

Conflicts:
	WebContent/js/controllers.js