fix a compiling error
Merge pull request #2404 from minggo/assetmanager

fix a compiling error
Merge pull request #2398 from lgb/float_comparison_issue

fixed #1935: Float comparison must not use "==" in the equal function of CCPoint and CCSize, we should compare float number by using epsilon and absolute difference.
Update AUTHORS
Removing unused file(uthash.h) in JSB projects.
Merge pull request #2405 from dumganhar/master

Removing unused file(uthash.h) in JSB projects.
Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors

Uses printf format. Enabled for GCC and clang.
Fixed GCC warning on narrowing conversion
Add the base sample code for ads
Solve the bug in ant build.
Merge pull request #2408 from sergey-shambir/gcc_warning

Fixed GCC warning on narrowing conversion
issue #2071: Updating cocos2dx.ini, skipping auto-generating cc.TMXLayer.getTiles(), it needs be bound manually .
fixed #2017: Binding cc.TMXLayer.getTiles manually.
Merge pull request #2410 from dumganhar/iss2071-jsb-getTiles

fixed #2017: Binding cc.TMXLayer.getTiles() manually.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2411 from CocosRobot/updategeneratedsubmodule_1366363642

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Added CC_FORMAT_PRINTF to CCString

Added for CCString::initWithFormat() and CCString::createWithFormat().
Fixed warnings.
Don't set animation interval on emscripten builds since that is driven by the request frame API.
Add note on origin of libxml binary.
Remove -DLINUX from Emscripten chipmunk makefile