Merge branch 'master' of https://github.com/luyifan/Yuloow

Conflicts:
	Yuloow/Classes/ChanLayer.cpp
	Yuloow/Classes/ChanLayer.h
	Yuloow/Classes/HelpLayer.cpp
	Yuloow/Classes/HelpLayer.h
	Yuloow/Classes/JiejiLayer.cpp
	Yuloow/Classes/JiejiLayer.h
	Yuloow/Classes/MenuLayer.cpp
	Yuloow/Classes/MenuLayer.h

Signed-off-by: luyifan <maxluyifan@gmail.com>