opretLogin
Merge branch 'origin/master'

Conflicts:
	web/OpretLogin.xhtml