set prompt for async console commands
fix console prompt
fix console prompt
Merge pull request #1 from cocos2d/develop

merge upstream/develop
Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop
add back prompts
add return
remove redundant return
quick fix for positioning the FPS on non HD
Merge pull request #5340 from ricardoquesada/fix_fps

quick fix for positioning the FPS on non HD
Linux local storage support. Depends on libsqlite3-dev
Linux websockets support.
Merge pull request #5324 from heliclei/develop

set prompt for async console commands
Linux Spidermonkey 27 support.
Minor debugging messages and guards.
Dependencies installation is skipped on linux distributions that does not use .deb package format.
Linux javascript bindings support.
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
Merge pull request #5339 from azmeuk/jsb-linux

closed #3895: Linux javascript bindings support.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into runtime

Conflicts:
	cocos/scripting/CMakeLists.txt
	tools/project-creator/module/cocos_files.json