something

something
Merge branch 'master' of https://github.com/airspuer/YiMeiquan

Conflicts:
	NewsBodyViewController.m