功能扩展
Merge branch 'master' of https://github.com/boboge/fellowY.git
Merge branch 'master' of https://github.com/boboge/fellowY.git

Conflicts:
	FellowY/AndroidManifest.xml
	FellowY/bin/FellowY.apk
	FellowY/bin/classes.dex
	FellowY/bin/resources.ap_
测试 冲突