Some fixes.
Merge branch 'master' of github.com:Infosfer/cocos2d-x

Conflicts:
	cocos2dx/label_nodes/CCLabelBMFontv2.cpp