Removed CORS from NGINX because Django does that.
Merge remote-tracking branch 'origin/master'