Admin strani
Uporabniki
Custom views/error views
Fixed views: analysis, about
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	data.db
	newstracker/urls.py