Merge branch 'master', remote-tracking branch 'origin'
updating settings and urls for the public site