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
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 :)
Premaknil 'CourseDetailCtrl' v controllers\course.js
Merge pull request #68 from aOberstar/master

...