Merge pull request #19 from alesblaznik/master

Twitter Bootstrap
Merge pull request #4 from ipri2013/master

Update kode
Merge pull request #5 from aOberstar/master

Update Andrazeve kode
Merge pull request #25 from aOberstar/master

AngularJS
Merge pull request #6 from ipri2013/master

AngularJS
Tortni diagram predmetov

Dodan tortni diagram predmetov, ki pa zaenkrat uporablja fake procente -
torej to je potrebno samo se nastimati, da se bo bralo iz baze in bo
taprava vrednost
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
Raphael error fix

Odpravljena napaka pri Raphael grafu. Tezava je nastopila takrat ko je
bil data array prazen.
Baza naj ne bo v repozitoriju.
Merge pull request #28 from zigaemersic/master

Raphael error fix
Merge branch 'master' of https://github.com/ipri2013/opencollea
Merge pull request #29 from alesblaznik/master

Odstanil bazo iz repozitorija.