人人登录
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/listener.apk
	src/com/lewen/listener/bean/Constants.java