cc.Texture2D.contentSize() for compatibility with jsbindings
Update CCActionInterval.js
Update CCTexture2D.js

oops
Merge branch 'actionOneTwo' into mydevelop
Merge branch 'contentSizefix' into mydevelop