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

Conflicts:
	AndroidManifest.xml
	src/com/tss/model/URLs.java