cats allowed instead of ok
added email
Merge branch 'temp' into qa
default
moved json to not use django_extension
Merge branch 'qa' of github.com:nextlanding/nextlanding-api into qa
moved json to not use django_extension
Merge remote-tracking branch 'origin/qa' into qa