Rijeseno: #129, #123, #119, #117
Merge branch 'master' of https://github.com/SoftLab-IS/ermex-pm