data controller fix, nesto admina
Merge branch 'master' of https://github.com/svemirko/pkf

# By filip
# Via filip
* 'master' of https://github.com/svemirko/pkf:
  Pred lokacije
Merge branch 'master' of https://github.com/svemirko/pkf

# By filip
# Via filip
* 'master' of https://github.com/svemirko/pkf:
  pred upload