Relatives
Merge origin/etkeztetes into etkeztetes

Conflicts:
	web/js/main.js