changes to staging
Merge branch 'master' into staging
Merge branch 'staging'
updates for code and images in the cloud