Odstranil __author__
Merge pull request #64 from aOberstar/master

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

Conflicts:
	opencollea/resources.py
	opencollea/urls.py
Pri merganju sem pozabil dodat RegistrationDetailsResource.
Avatar uporabnika preko Gravatar #60
Merge pull request #65 from alesblaznik/master

RegistrationDetails form
Added django-etherpad-lite submodule.
Coure notes scaffold.
jQuery plugin for embedding Etherpad.
jQuery plugin for embedding Etherpad.
course-detail.html prikaže "pretty" title predmeta, q&a tab prikaže samo
q&a relevantne za določen predmet
Merge https://github.com/ipri2013/opencollea

Conflicts:
	opencollea/urls.py
Notetaking.
Pep8 - pozabil prej preverit ;).
Merge pull request #66 from alesblaznik/master

Notetaking with Etherpad
commit delam za vsak slučaj pred merganjem z etherpad-commitom
Merge https://github.com/ipri2013/opencollea

Conflicts:
	opencollea/resources.py
	opencollea/static/js/app.js
	opencollea/static/js/controllers.js
	opencollea/static/js/services.js
	opencollea/static/partials/course/course-detail.html
	opencollea/urls.py
Merged with Etherpad, tried posting Answer :)