add dotguy
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	Classes/MaskLayer.cpp
	proj.ios_mac/stbProject.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	proj.ios_mac/stbProject.xcodeproj/project.pbxproj
update action ease
edit moredetaillayer
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	proj.android/jni/Android.mk
modify rectangleInterface and mapTv
Merge pull request #16 from RaoZiJian/master

Add new light resources
edit masklayer
merge yike
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	Classes/MaskLayer.cpp
	proj.ios_mac/stbProject.xcodeproj/project.pbxproj
Merge pull request #15 from encal/master

add dotguy~~~
update effects
Merge branch 'master' of github.com:calfjohn/StbProject
modify rectangle, remove marco define
update row and column
modify some effects
Merge branch 'master' of github.com:calfjohn/StbProject
Merge pull request #17 from Ryeeeeee/master

modify some effects
add random rectangle