BRANCH PROMJENA
Merge pull request #1 from elismemic/ELIS

BRANCH PROMJENA