Merge-teszthez + kis update
Merge branch 'master' of https://github.com/elementbound/VarosokWEB.git

Conflicts:
	config.php