Add ShortUUIDField based on shortuuid
Merge pull request #476 from vinu76jsr/master

Adding `login_required` decorator presence check for views for `show_urls` output
ticket #474 add information to documentation about dot templates and how changes to django templates can effect them
Fix `import json` for Python 2.6/2.7, though this bug only shows on Django 1.7 which only supports Python 2.7.
Merge pull request #479 from joncotton/pr356_followup

Fix `import json` for Django 1.7
Try to import json before simplejson

Follow up for #479 and #356

So that we don't get the deprecation warning on django 1.6 and python >= 2.6 (since it supports json)
Merge pull request #480 from Naddiseo/patch-1

Try to import json before simplejson
remove whitespace
fix from #481 for Python 3.2
fix missing brace
Merge branch 'master' into shortuuid-field

Conflicts:
	.travis.yml
	django_extensions/db/fields/__init__.py
	django_extensions/tests/__init__.py
Add docs to shortuuid field
Allow graph_models command to be restricted to specific models only
Allow to specify the settings you want to see

Now, print_settings accepts settings variable names and just print
those variables:

$ python manage.py print_settings DEBUG MEDIA_URL
DEBUG                                    = True
MEDIA_URL                                = '/media/'
$

or:

$ python manage.py print_settings DEBUG MEDIA_URL --format=pprint
{'DEBUG': True, 'MEDIA_URL': '/media/'}
$
Merge pull request #488 from humitos/master

Allow to specify the settings you want to see when using print_settings command
Ignore rule: block comment should start with '# '
--use-mirrors has been deprecated from travis
Fixes E713 warnings from flake8
Fixes #469 removing deprecated status
Added django supported versions. Fixes #460