1
Merge branch 'master' of https://github.com/baoyi/SimpleLauncher

Conflicts:
	res/xml/preferences_plus.xml