issue #2276: Add ScrollView lua binding and test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
[NaCl] Fix sigslot.h compilation on NaCl ARM
[NaCl] Disable http tests under NaCl
[NaCl] Fix NaCl build which had been disabled.

Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
Fix compile warnings in LuaOpengl.cpp
[NaCl] Remove legacy nacl_mounts usage.

Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
[NaCl] Recreate webstore zip archive each build.
[NaCl] Remove use of -lnosys
[NaCl] Don't cache font size

This avoids churn of the cached font when different
sizes of the same font are requested sequentially.

Review URL: https://codereview.chromium.org/14308007
[NaCl] Build for all nacl architectures
[NaCl] Add support for building using glibc toolchain.

BUG=
R=binji@chromium.org

Review URL: https://codereview.chromium.org/14694016
[NaCl] update build-nacl.sh
[NaCl] Remove missing functions from lua stdlib.

NaCl doesn't support tmpfile() or exec() so remove
these from the lua stdlib build when building for NaCl.
Re-adds 'CC' prefix to objective-c classes.

And also makes it compile on Mac, which was broken
Merge pull request #2754 from longlene/develop

smarter script for creating Android project
[ti ignore]
Update the JS binding of plugin.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #2955 from sbc100/nacl_develop_fixes

closed #2318: Adding Native Client support for develop branch and some warnings fixes.