Fixed url tags and imports for Django 1.4
Merge Django 1.4 upgrade