ui change password
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-ui/src/main/webapp/js/signin.js