add dotguy
update resource
Merge pull request #14 from Ryeeeeee/master

add item selected effect
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
add EaseSineOut action for all
Merge branch 'master' of https://github.com/calfjohn/StbProject
update action ease
update resource
edit moredetaillayer
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	proj.android/jni/Android.mk
Add new light resources
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