Merge branch 'master' of C:\Users\Korisnik\PhpstormProjects\eGovernment with conflicts.
Merge remote-tracking branch 'origin/master'