Priprava admin strani.
Admin strani
Uporabniki
Custom views/error views
Merge pull request #1 from sevenmore/merge#1

Admin strani, custom views, merged stuff from other pull requests
Fixed views: analysis, about
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	data.db
	newstracker/urls.py
Merge pull request #9 from bp1234/master

models
Merge branch 'master' of https://github.com/sevenmore/newstracker
Merge branch 'master' of https://github.com/ipri2013/newstracker
Just to make sure it merges correctly
Added app rss, fixed models and added them to admin page
Merge pull request #10 from sevenmore/master

Added rss app, models and admin edit
update
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	data.db
remove DB
Fixed urls.py to include app specific urls.
Merge pull request #11 from sevenmore/master

Fixed urls.py to include app specific urls.
Removed database, added requirements, LICENSE and README.
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	newstracker/urls.py
update
AnngularJS, REST service.
Merge pull request #12 from sevenmore/master

AngularJS