Merge origin/master

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