regisztracio.py ú
FIX import error on regisztracio
Merge branch 'lmaresz' (again)

Conflicts:
	program.py