Merge branch 'master' of github.com:Alife/Android
Merge branch 'master' of github.com:Alife/Android
Merge branch 'master' of github.com:Alife/Android

Conflicts:
	AndroidManifest.xml
1.医院选择列表添加删除按钮；
2.修改医院添加界面布局。