好了
Merge branch 'master' of https://github.com/huhuanming/motor

Conflicts:
	Moto/moto_LivePostViewController.m