update
korekcije
Merge branch 'master' into ng

Conflicts:
	database/misc/db_migrate.sql