冲突
Merge branch 'master' of https://github.com/hewep/myapp

Conflicts:
	src/com/app/common/AppConfig.java