Lazy load custom user FK to prevent circular dependency
django.conf.urls.defaults is deprecated
Django 1.4
Update urls.py
Update compat.py
Merge pull request #49 from vikingco/compatibility/django1.4

django.conf.urls.defaults is deprecated
update documentation to show usage with StateField
Merge pull request #51 from vikingco/fix/documentation

update documentation to show usage with StateField
Merge pull request #46 from vikingco/custom_user_fix

Lazy load custom user FK to prevent circular dependency
Pypi release 1.6.1
Replaces simplejson imports with python's json module
Merge pull request #54 from gcollazo/fix-simplejson-warning

Replaces simplejson imports with python's json module
Version 1.6.2 pushed to pypi.
Merge branch 'master' of https://github.com/vikingco/django-states2

Conflicts:
	README.md
	django_states/__init__.py