修改主界面加载方式，防止启动时候假死状态
Merge origin/master

Conflicts:
	nbproject/project.properties
Merge origin/master