21
Merge branch 'master' of https://github.com/lijingcheng/BiketoTibet

Conflicts:
	BiketoTibet/AppDelegate.mm