Merge from upstream to origin
Ignore 'DerivedData' directory
Add 'setFont' and 'setAnchorPoint' to CCEditBox
Move height adjustment code from 'getRect' to 'keyboardWillShow'
add the CocosDenshion project
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
Add VS2012 Express For Windows Desktop support in install-templiates-msvc.bat
Merge remote-tracking branch 'origin/master'
Merge pull request #2033 from xyhl515/master

fixed #1746: Added VS2012 Express template installing support.
fixed #1731:change struct to class
Merge pull request #2038 from minggo/iss1731-lua-declaration

fixed #1731:change struct to class
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into iss1489-AssetsManager
delete searpath
delete search path
Update AUTHORS