Assignment #2 :: Task #3 is done. The first variant of the models.
Merge pull request #6 from dmozina/master

Assignment #2 Fixes.
Trying to resolve db errors.
Newly created .db file resolving db issues.
Merge pull request #7 from busho/master

Db issues resolved
Video providers are added.
Za 2 Točki:

4. Uporabite kakšno lušno vizualizacijo v JavaScriptu. Nekaj knjižnic: d3js, Raphael, Flot.

DONE.

rapha1.htm
rapha2.htm
2 variants of logo by now.
Merge branch 'master' of https://github.com/ipri2013/portalznanja
Merge branch 'alex'
Implemented tastypie web services to provide featuredVideos functionality. These can be found within the "api" module.
Added new static .html files.
Solved numerous database issues with ForeignKey and OneToOneField lookups!
Added fixture for manual data loading through manage.py script.

This commit mostly refers to IPRI assignment 3 task 3.
Merge pull request #8 from busho/master

Tastypie web services for communication with frontend JS.
Angular JS
Merge branch 'master' of https://github.com/ipri2013/portalznanja

Conflicts:
	sqlite3.db
a
AngularJS