需求分析
Merge branch 'master' of https://github.com/zhangyandong/SouChepad

Conflicts:
	SouChepad/Class/MyMessage/Controller/MyMessageController.m