-.-
Merge branch 'mafiagame' of https://github.com/mafiagame/quick-cocos2d-x into mafiagame

Conflicts:
	lib/cocos2d-x/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
	lib/cocos2d-x/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h