Merge pull request #1 from sevenmore/merge#1

Admin strani, custom views, merged stuff from other pull requests
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