Signed-off-by: Gálffy Tamás <ezittgtx@gmail.com>
Merge branch 'master' of https://github.com/elementbound/VarosokWEB

Conflicts:
	tests/users.php - solved