fix url parse error for 'ws://domain.com/websocket' pattern
Add advertisement type for more Ads plugins.
Merge pull request #2928 from dumganhar/develop

[Win32] Deprecating VS2010, removing unused template files.
issue #2304:use function to simplify acceremeter call back
Adjust ProtocolAds for more Ads plugins.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 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.