Merge pull request #14 from ipri2013/master

PEP8
Merge pull request #15 from ipri2013/master

Pricetek dela zadnje faze
Merge pull request #59 from alesblaznik/master

Končan UserProfile obrazec.
dodal "home" page, prvo stran po prijavi
Dodal tabe na class-detail strani
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
PEP8 & unused imports

PEP8 dolzine vrstic in odstranitev neuporabljenih importov
(find_courses.mooc puscen noter, ker se bo se rabil)
Merge pull request #63 from zigaemersic/master

PEP8 & unused imports
Merge https://github.com/ipri2013/opencollea
Preverjena skladnost s pep8, dodal par stvari pri models.question
Merge pull request #64 from aOberstar/master

V nadaljevanju naj se definicije storitev nahajajo v static/js/services.
Merge branch 'master' of https://github.com/ipri2013/opencollea

Conflicts:
	opencollea/resources.py
	opencollea/urls.py