xitongwenjian
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024
系统文件
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024
引导页和home页失陪
merge

merge
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024

Conflicts:
	Classes/HomeLayer.cpp
HomeLayer