Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
revert submodules
fix more code with hungarian notation
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
revert AccelerometerSimulation.m
Merge branch 'develop' into Array

Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
change for iterator and callfunc
fixed compile error
fix compile errors.
change play arguments
change play arguments
Removes unneeded files

New functionality is merged into the 'official' classes
removes `using namespace std` from header file

... in order to prevent possible collisions.

`using namespace XXX` MUST never be used in header files.
Merge pull request #4537 from ricardoquesada/more_renderer_fixes

More renderer fixes
Android and Linux fixes
Merge pull request #4538 from ricardoquesada/linux_and_android_fixes

Android and Linux fixes
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4539 from CocosRobot/updategeneratedsubmodule_1387397647

[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest

Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
Merge pull request #4541 from ricardoquesada/sprite_test_love

Improves SpriteTest