Issue #4580: Fix image format constant inconsistence
Fixed #5744: Rename TextFieldTTF's textFieldWithPlaceHolder to create
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update h5 ref
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	frameworks/cocos2d-html5
Merge pull request #627 from pandamicro/master

Update h5 ref