Merge remote-tracking branch 'origin/developerF' into developerF

# Conflicts:
#	src/main/java/com/caimei/modules/user/web/NewCmShopController.java