Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
Disable debugging symbols for all Emscripten builds. -g is simply too slow to be a useful debugging tool. If someone needs it they should add it back in, but it is not sensible default behavior at this point.
Update CCEditBoxImplIOS.mm

https://github.com/sunxiaoyu/cocos2d-x/commit/02c664730669c7e3d5d0ecc727deab9aa785c2c7
correct the library path
OnEnterTransitionDidFinish was called twice when a node is added in onEnter

Fix ported from cocos2d-iphone:
https://github.com/cocos2d/cocos2d-iphone/commit/99b7bef8800bd850f6b0c7dc1eb09d8e81fd80f7
Merge pull request #2654 from minggo/ETC1-support

Support ETC1 format on Android
Merge pull request #2659 from minggo/ETC1-support

modify ORGANIZATIONNAME
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2661 from CocosRobot/updategeneratedsubmodule_1369736349

[AUTO] : updating submodule reference to latest autogenerated bindings
Explicitly initialising CCAcceleration structure to report zeros when run in device simulator
Ability to save/retrieve CCData into/from CCUserDefault
Removed unused variable which caused Linux build to fail
adding Norwegian language support
adding norwegian language...
Merge pull request #2665 from jotel/accel-fix

Explicitly initialising CCAcceleration structure
Update AUTHORS

[ci ignore]
Merge pull request #2650 from varlucian/onentertransitionfinnished

OnEnterTransitionDidFinish was called twice when a node is added in onEnter
Update AUTHORS

[ci ignore]
CCConfiguration has format

CCconfiguration has a file format.
It has a data and metadata