issue #2277: Add OpenGL lua binding
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
fix url parse error for 'ws://domain.com/websocket' pattern
issue #2304:use function to simplify acceremeter call back
issue #2277: Add OpenGL lua test samples
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
Merge pull request #2929 from minggo/iss2304-refator-cclayer

issue #2304:use function to simplify acceremeter call back
Merge pull request #2904 from edwardzhou/master

closed #2312: WebSocket url parse error for 'ws://domain.com/websocket' pattern
Update AUTHORS [ci skip]
[emscripten] Updating .travis.yml, export environment variables for emscripten port.
Merge pull request #2930 from natural-law/develop

Optimize class ProtocolAds for more Ads plugins.
issue #2277: modify platform config except win32
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
issue #2277: add a new line
issue #2304:accelerometer fix of mac
Merge pull request #2936 from minggo/iss2304-refator-cclayer

issue #2304:accelerometer fix of mac
Update .gitignore

tools/project-creator/create_project.py is generating multi-platform project on COCOS2DX_DIR/prjoects
Merge pull request #2937 from growingdever/patch-2

Update .gitignore
issue #2277: Delete some conflict file and resolve some error
Merge pull request #2935 from samuele3hu/opengl_develop

issue #2277: Add OpenGL lua bining and some test samples