Merge pull request #26 from zigaemersic/master

Tortni diagram predmetov
Merge pull request #3 from ipri2013/master

Pull k sebi
ł
Odstranil package portal
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	opencollea/assets.py
	opencollea/resources.py
	opencollea/static/js/app.js
	opencollea/static/js/bootstrap.js
	opencollea/static/js/controllers.js
	opencollea/static/js/jquery-2.0.0.js
	opencollea/templates/base.html
	opencollea/urls.py
Merganje.
jQuery.
Merge pull request #27 from alesblaznik/master

Login.
Merge pull request #7 from ipri2013/master

Alešev login