Merge pull request #1 from cocos2d/master

update project
fix scale9sprite bugs when setting inset or making spriteframe rotate enbled.
Merge remote-tracking branch 'refs/remotes/origin/master'
remove warning
Merge branch 'cocos2dx_master'