merge
Merge branch 'ui_label' of https://github.com/myoung-zynga/cocos2d-html5 into ui_label

Conflicts:
	cocos2d/ui/labels/CCUILabelTTF.js