Make remote resources local
Merge branch 'https'
Merge branch 'master' into production