nove vlastnosti
Merge branch 'master' of https://github.com/HKFree/UserDB

Conflicts:
	db/userdb-schema.sql