Ispravljeni bugovi: #45 #49 #50 #77
Merge branch 'master' of https://github.com/arnela/SI2013tim11