The touchPriority should come from the CCLayer, not fixed to 0. This allows the CCScrollView to have user defined touch priority.
Only allow m_bTouchMoved = true if the finger moved more than 15 pixels.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

Conflicts:
	extensions/GUI/CCScrollView/CCScrollView.cpp
Blackberry: Keep screen awake.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Remove files accidentally committed to github
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Revert scroll detection changes
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/FlowerpotGames/cocos2d-x

Conflicts:
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fix bad merge
reverse
CCLayerColor::_realOpacity is not set in ::initWithColor(…) causing unexpected behavior if a ::runAction(CCFadeTo::create(…)) applied to the LayerColor.
reverse commit
bad merge
reverse merge
reset menuItem
reset eglview and scrollview
Merge branch 'CCLayer-Opacity-Fix' into FPG_Development

Conflicts:
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h