laowu
Merge branch 'master' of https://github.com/tanliwen/tss.git

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/resources.ap_
	bin/tss.apk
laowu