Adds staging environment files
Merge branch 'master' into staging