CORS Fix, AWS Updates

Merged Spencer Sutton requested to merge aws-integration into master

Merge request reports