merge
Merge branch 'master' of https://github.com/pataiadam/Kvizmesterek.git

Conflicts:
	Kvizmester/.classpath
	Kvizmester/.settings/org.eclipse.wst.common.component
	Kvizmester/WebContent/WEB-INF/web/common/common_layout.jsp