closed #2920: fix bug voice recognition input crash on ios7
issue #2920: fix coding style
issue #2920: fix indent
Fixed crashing when calling CCDirector's end().
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
issue #2920: Change internal ios  keyboard type EditBox::InputMode::NUMERIC from UIKeyboardTypeNumbersAndPunctuation to UIKeyboardTypeDecimalPad
issue #4039: set tilemap <object> x and y value to original, and add “position_x”, “position_y”, “size_width” and “size_height” value.
refactor tilemap xml format index count.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
closed #2920: fix compile error after merge.
closed #2920: add a variable to save shared director.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic

Conflicts:
	cocos/scripting/lua/bindings/LuaBasicConversions.h
	cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
issue #3956:Replace Object with Ref
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
Merge pull request #5432 from CocosRobot/update_cocosfiles_1392955706

[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7

closed #2920: fix bug: voice recognition input crash on ios7
Update CHANGELOG [ci skip]
Update CHANGELOG [ci skip]