Merge from upstream to origin
Ignore 'DerivedData' directory
Add 'setFont' and 'setAnchorPoint' to CCEditBox
Move height adjustment code from 'getRect' to 'keyboardWillShow'
Added 'setPlaceholderFont()' to CCEditBox
Modified a preprocessor line which distinguishes device platform in CCEditBox test code.
Merge branch 'master' of https://github.com/neokim/cocos2d-x

Conflicts:
	scripting/javascript/bindings/generated
fixed #1749: Mac platform works ok.
fixed #1749: Fixed compilation errors for win32.
Merge pull request #2044 from dumganhar/iss1749-editbox

fixed #1749: Adds 'setFont' and 'setAnchorPoint' to CCEditBox.