no message
Merge branch 'master' of https://github.com/liaocpen/weiboApp

Conflicts:
	weiboApp/weiboApp/controller/MainViewController.m