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
Fix CCRepeat#create is recieved bad argument on Lua binding.
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
Fix CCRepeat#create argument
Merge pull request #2030 from giginet/cocos2dx-pull-request

fixed #1745: Fix CCRepeat#create is recieved bad argument on Lua binding.
Update AUTHORS
Add VS2012 Express For Windows Desktop support in install-templiates-msvc.bat
Merge remote-tracking branch 'origin/master'
New jsb tests (TableViewTest).
Merge pull request #2034 from dumganhar/jsb-tableviewtest

New jsb tests (TableViewTest).
don't need to remove assets/Images/test_*.pvr.gz files in multi-platform-cpp template
Merge pull request #2037 from walzer/master

don't need to remove assets/Image/test_*.pvr.gz files in multi-platform-cpp template