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

Conflicts:
	Classes/GuideLayer.cpp
	Classes/HomeLayer.cpp
	Classes/HomeLayer.h
ok
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024

Conflicts:
	Classes/HomeLayer.cpp
version 1.5.1