Merge pull request #14 from ipri2013/master

PEP8
Merge pull request #15 from ipri2013/master

Pricetek dela zadnje faze
Merge pull request #16 from ipri2013/master

KOda
Deprecation problem & pep8

Popravek override_urls in nekaj malenkosti v pep8
Merge pull request #62 from zigaemersic/master

Deprecation problem & pep8