Updates cocos2d-x
gui -> ui.
gui -> ui.
guy -> ui for tests.
Updates VS projects.
Updates Android.mk in js-tests.
Merge pull request #119 from lihex/master

update cocos2d-console.
Merge pull request #118 from dumganhar/master

gui -> ui.
Updates vs project.
Merge pull request #120 from dumganhar/master

Updates vs project.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
update submodule