11
Merge branch 'master' of https://github.com/linghp/ZLFAsist.git

Conflicts:
	ZLFAssist/src/com/cqvip/zlfassist/activity/MainActivity.java