Merge pull request #1 from cocos2d/master

merg

Author: chuanweizhang2013

.gitmodules

@@ -1,6 +1,12 @@
 [submodule "cocos2d-x"]
-	path = JSB/cocos2d-x
+	path = jsb/cocos2d-x
 	url = git://github.com/cocos2d/cocos2d-x.git
 [submodule "cocos2d-html5"]
 	path = cocos2d-html5
 	url = git://github.com/cocos2d/cocos2d-html5.git
+[submodule "tools/cocos2d-console"]
+	path = tools/cocos2d-console
+	url = git://github.com/cocos2d/cocos2d-console.git
+[submodule "tools/bindings-generator"]
+	path = tools/bindings-generator
+	url = git://github.com/cocos2d/bindings-generator.git

.travis.yml

@@ -0,0 +1,18 @@
+language: cpp
+script:
+- export PYTHON_BIN=/usr/bin/python
+- ./tools/travis-scripts/run-script.sh
+before_install:
+- ./tools/travis-scripts/before-install.sh
+env:
+  matrix:
+  - GEN_BINDINGS=YES
+  - PLATFORM=android
+  global:
+  - secure: FlC71LfwoBQ0mvJnxLdScFunhWKTvpQhbheLneWBbEFYpRFiMBwBbkZ9CIgYwzVQA7Zf7smhPXJMWuch0R9332uc7H7WDx6l7iOW0tVxwCHP2BSkfIFXU433AQeS4/5OgZU8bJDUOoJKqNC0EpkQ+6elhuAnR4MP/KGx6mKtGU0=
+  - secure: jZyWJln6/IQ0p0iSSsZOpifEZaW+M4tdaYiJt6Q+CL6GanJd9F2nP0tJdEGBOx2KKGWcyY0KKibO2xg6CBZnsmGxjU4G2QDIcQBtUFq+iKwkLIQ31jMqEGV6zPJVLMMNUfoOAKMppCgukyoPy7ugThuReHMAbjyy4AkKKjx4o9Q=
+  - secure: gdYnnweKE19bzSrd728t21tIWeNIVhChd58WtIuA6SbJg5WsGScyFXtaA3NxmcGaAjIU9GC3zGfxH1upWMinypO3W+XUsZtRmOvIkPMDQjdPA9wNu4ekKNsytUjIcuG2T5+m0dZbHCtLcMELekZ5aazNgsk1F20xpbSSnVr2u5E=
+branches:
+  only:
+  - master
+  - develop