Add ShortUUIDField based on shortuuid
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
Fixed conflict