added emscripten keyboard support
Re-use SAFE_HEAP option in emscripten.
Move the developer informations to file Configs.h
issue #2439, Add flurry ads plugin for iOS.
Documentation fix: add missing parameter name.
update CHANGELOG
Merge pull request #3326 from minggo/releasing

update CHANGELOG
issue #2435:Lua template supports mac port
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop
Remove unnecessary/wrong use of \a in comment.

\a is meant to refer to arguments. Links to class/function names are
automatic generated in doxygen.
Remove colon after @param @warning @deprecated

Added a missing @param.
Merge pull request #3327 from samuele3hu/TestDevelop

issue #2435:Lua template supports mac port
[ci skip]
Merge pull request #3323 from timothyqiu/docfix

Documentation fixes
Merge pull request #3224 from azmeuk/emscripten

emscripten keyboard support
[Tizen] Fix compile error.
issue #2439, Add flurry ads plugin for android.
closed #2439, Add sample code for plugin flurry Ads.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3328 from natural-law/develop

Add plugin flurry ads