change password.
Merge branch 'master' of https://github.com/DavidSalzer/activistsForISraelNew

Conflicts:
	components/user/userProfile.css
	components/user/userProfile.html