fixing bug where SimpleAudioEngine::playEffect() and SimpleAudioEngine::playBackgroundMusic() on linux plays twice
Update CCControlButton.cpp

fixed a bug that users can't set a button highlighted in the upper logic. also modify some coding format.
Merge pull request #2118 from minggo/refactor-ccuserdefault

issue #1529:modify CCUserDefault.cpp path in linux makefile
Merge pull request #2091 from jsambuo/linux-audio-twice-fix

fix for SimpleAudioEngine::playEffect() and playBackgroundMusic() playing twice on linux
Update AUTHORS
fixed #1811: Adding a method to get file data for JSB. Updating the way of encoding cpp string to jsval or jsval to cpp string.
Merge pull request #2119 from dumganhar/iss1811-getfiledata-jsb

fixed #1811: Adding a method to get file data for JSB. Reverting the implementation of JSStringWrapper.
fixed #1811: Fixing complication error on win32 after this pull request (https://github.com/cocos2d/cocos2d-x/pull/2119).
Merge pull request #2120 from dumganhar/master

fixed #1811: Fixing complication error on win32 after this pull request (https://github.com/cocos2d/cocos2d-x/pull/2119
fixed #1812: A warning of getStringWithEllipsisJni function when compiling it with clang.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed #1812: Minor fix.
fixed #1811: getStringWithContentsOfFile ~> getStringFromFile .
Merge pull request #2122 from dumganhar/iss1811

fixed #1811: getStringWithContentsOfFile ~> getStringFromFile .
Merge pull request #2121 from dumganhar/master

fixed #1812: A warning of getStringWithEllipsisJni function when compiling it with clang.
Fix package installation in make-all-linux-project

There was a bug where missing packages would cause the script
to exit.

This change also makes several improvements:
- script can now be run from anywhere (not only the cocos root)
- apt-get is called only once to install all missing packages
  (this makes output much more informative on first use)
- added comment/docs to the top of the script
Update GLES version notes in README.mdown

Also, remove trailing whitespace and improve formatting.
Add 'make run' target for linux projects.

Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
  build system.
- Remove redundant main.h files.
Cleanup the tolua++ bindings build system.

Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.

Update README file with current instructions.

Re-generate output file using new build system.

Add build.sh and build.bat for building on POSIX and
win32 respectively.
Merge pull request #2127 from sbc100/tolua_build_system

fixed #1818: Cleanup the tolua++ bindings build system.