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 pull request #2042 from dumganhar/master

Adds AssetsManagerTest in cocos2d-win32.vc2012.sln.
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.
Update AUTHORS
issue #1489:clear version code before getting it
Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into iss1489-AssetsManager
fixed #1750: [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode.
Merge pull request #2045 from dumganhar/iss1750-editbox-pos

fixed #1750: [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode.
fix a bug of CCUserDefault
fixed #1489:sample works ok
Merge pull request #2047 from minggo/iss1489-AssetsManager

assets manager works ok
fixed #1489:add namespace to AssetsManager