fixed subscriptions
custom file working, not sure how useful it is though
fixed invalid login error message and tidy up CO
Merge branch 'feature/custom_file' into develop
fix up s3 cors issues with custom headers
combine content into single call createAndUpload
Merge branch 'feature/content_tidy' into develop