Merge branch 'master' into Matt-Branch-4

Changed shop screen background