add friendly HTTP responses
add friendly HTTP responses
solve conflicts
set 200 as the default error response
add new tests
add new tests
fix django 1.5 deprecation warnings
Merge remote-tracking branch 'origin/friendly_response' into friendly_response
add django imports backwards-compatible
add django imports backwards-compatible
Merge remote-tracking branch 'origin/friendly_response' into friendly_response
Django-1.5 - fix DeprecationWarning : use hashlib instead of django.utils.hashcompat.
Django-1.5 - fix DeprecationWarning: use django.conf.urls instead of django.conf.urls.defaults.
Merge pull request #11 from Starou/django-1.5

Django 1.5
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tokenapi/tokens.py
	tokenapi/urls.py