代码整理
Merge branch 'master' of git@github.com:javalive09/NewAppManagerPlug.git

Conflicts:
	AndroidManifest.xml