增加设置
Merge branch 'master' of https://github.com/baoyi/SimpleLauncher.git

Conflicts:
	res/layout/activity_main.xml
	src/com/inzi123/launcher/Launcher.java