Changes samples' function prototypes to apply newly introduced callback type.
fix some typos
Merge pull request #2491 from minggo/master

fix some typos
Merge pull request #2443 from rodrigogolive/spine-fix

Fixing broke linux build
Update AUTHORS
Merge pull request #2484 from sergey-shambir/bit_more_verbose

Logging: More verbose output in removeChildByTag and getActionByTag
Merge pull request #2455 from FlowerpotGames/CCScrollView-TouchPriorityFix

CCScrollView TouchPriority Fix
Update AUTHORS
Added support for javascript byte code
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master

Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
Fix warnings.
Add .travis.yml

This builds all libraries and examples in both debug
and release for Linux and NaCl platforms.

Add travis build status image to README.mdown.

Also, split the linux dependency installation into
its own script: install-deps-linux.sh
Add missing file from CocosDenshion.
Added README
Fixed issue when used via pipe
Modified to ensure no popup notify when no byte code file
Support negative scaling of CCScrollView.
Not checking for it in CCScrollView::getViewRect causes intersectsRect calls (eg: to check if the touch was within the bounds) to return false.
Fix missing protocol method warning for iOS 6.0 addition
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Add CCDirector::popToSceneStackLevel(int level)
This replicates a change made to cocos2d-iphone in the following commit:
http://github.com/cocos2d/cocos2d-iphone/commit/59c5272bffc2c9fb4685ff5665af33d0595dabf1

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210