修改配置文件目录结构
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	AndroidManifest.xml