update
Merge branch 'master' of https://github.com/uxyheaven/XYQuickDevelop

Conflicts:
	JoinShow/JoinShow/XYQuickDevelop/UI/XYParallaxHelper.m
	JoinShow/JoinShow/XYQuickDevelop/UI/XYSpriteHelper.m