Merge from upstream to origin
Ignore 'DerivedData' directory
Add 'setFont' and 'setAnchorPoint' to CCEditBox
Move height adjustment code from 'getRect' to 'keyboardWillShow'
fix a bug of CCUserDefault
issue 1489:add AssetsManager
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
issue #1489:modify sample code and add readme
Update samples/Cpp/AssetsManagerTest/README.md
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into iss1489-AssetsManager
Added 'setPlaceholderFont()' to CCEditBox
issue #1489: update ios libcurl and add android project
Modified a preprocessor line which distinguishes device platform in CCEditBox test code.
issue #1489:rename AssetsManagerProtocol to AssetsManagerDelegate
Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into minggo-iss1489-AssetsManager
issue #1489:android works ok
issue #1489:add some log
Adds AssetsManager support for win32.
Merge pull request #9 from minggo/iss1489-AssetsManager

issue #1489: Updates with upstream.