normal commit
Merge branch 'master' of https://github.com/lygn128/WanXiang

Conflicts:
	ChoujiangViewController.xib