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

Conflicts:
	Classes/MaskLayer.cpp
	proj.ios_mac/stbProject.xcodeproj/project.pbxproj