meta teg for loginza
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/view/login.jsp
loginza window shown