Added corsheaders and rest_framework to settings
Merge branch 'django_cors_headers' into develop