Some changes about login from Md. Khan
Some changes about login from Md. Khan
Merge origin/master

Conflicts:
	build/web/pages/general/login.xhtml