Merge remote-tracking branch 'origin/json' into json
predelano na json
predelano na json