issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
issue #2426:Modify tab and spaces
closed #2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS.
issue #2426:Modify coding style
Merge pull request #3236 from dumganhar/iss2427-js-parse-plist

closed 2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS.
issue #2426:Modify tab and spaces
[ci skip]
Merge pull request #3232 from samuele3hu/TestSample

issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
Adding popSceneBack() function to Director

This function deletes the running scene and returns the actual scene
back to the caller. This way, we can simply use it to perform a
transition animation, like this:

    Director::sharedDirector()->replaceScene(
            TransitionSlideInL::create(0.5,
            Director::sharedDirector()->popSceneBack()));

Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>