添加程序列表
Merge branch 'master' of https://github.com/baoyi/SimpleLauncher

Conflicts:
	res/layout/app_icon.xml