modified:   django_extensions/admin/__init__.py
	modified:   django_extensions/conf/app_template/urls.py.tmpl
Merge pull request #311 from paprykut/master

Use imports from django.conf.urls for django >= 1.4 to avoid DepreciationWarning.