Merge pull request #20 from ipri2013/master

KOda
Merge pull request #77 from alesblaznik/master

Discover
Merge pull request #21 from ipri2013/master

Aleseva koda
Chat frontend

Popravljen frontend chata
PEP refactor
Merge https://github.com/zigaemersic/opencollea
Merge pull request #79 from zigaemersic/master

Frontend chata in pep refactor v resources.py
Merge branch 'master' of https://github.com/ipri2013/opencollea