edit MaskLayer and MoreDetailLayer
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	Classes/MaskLayer.cpp
edit MaskLayer and RotateLayer
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	Classes/MaskLayer.cpp
Merge pull request #10 from encal/master

Merge code