Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Fixed Linux Shader Errors
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3_EventFrame
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
modify camera attach bug!
fix OBB intersects bug
Removes uthash in CCGLProgram
fix 0.2 version load bug.
Merge pull request #147 from lvlonggame/newcode

camera attach, OBB intersect, fix 0.2 version load bug
remove nodetoparent
Merge branch 'newcode' into v3
Fixed Label shifting when outline feature enabled
Fix some lua-tests error
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine