Merge branch 'forditas'

Conflicts:
	www/index.html