Merge branch 'master' of /Users/Lixing/Documents/webroot/jdshop with conflicts.