升级功能改造
Merge origin/master

Conflicts:
	src/net/ipetty/android/boot/SplashTask.java