Replaced stuff that is deprecated in Django 1.5
Merge pull request #5 from bolotov/testapp-1.5-beta

Updated urls.py to replace deprecated generic views