Merge pull request #1 from sevenmore/merge#1

Admin strani, custom views, merged stuff from other pull requests
modeli
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
Merge branch 'master' of https://github.com/ipri2013/newstracker

Conflicts:
	data.db