last version on jasmina's kompjuter
Merge branch 'master' of https://bitbucket.org/machineria-admin/citatihr