add new tests
fix django 1.5 deprecation warnings
Merge remote-tracking branch 'origin/friendly_response' into friendly_response