的
Merge branch 'master' of github.com:pffair/wjw

Conflicts:
	AndroidManifest.xml