Merge branch 'master' into working-3
marketNew push to NewDetailViewController