5/
Merge branch 'master' of https://github.com/RongShu/xiaoqu

Conflicts:
	xiaoqu/AppDelegate.m