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

gui -> ui.