修改布局文件，添加数据库类
Merge branch 'master' of https://github.com/baoyi/SimpleLauncher

Conflicts:
	res/layout/activity_main.xml
	res/layout/app_icon.xml