修改model命名规则，建议以M开头，方便全局搜索时快速定位
Merge branch 'master' of https://github.com/iBcker/Maotachi

Conflicts:
	Maotachi/Model/MTownShop.m