Added rotationIsDir to Particle System. It sets the rotation of each particle to its direction
Added test for rotation is dir in particle system
Fixed syntax, integrated lines.png and lines.plist
CCLens3d can be concave

added boolean operator to enable the lens to be concave as well as
convex
Merge from upstream to origin
Ignore 'DerivedData' directory
Add 'setFont' and 'setAnchorPoint' to CCEditBox
Move height adjustment code from 'getRect' to 'keyboardWillShow'
Additional a transformation matrix, Used in is not parent-child relationship but we still need to maintain transformation  parent-child        Example:          GameObject_Parent(CCNode; create from CCNode)                 GameObject_sub1(CCNode; Create from the same CCSpriteBatchNode,the node's parent is CCLayer )                        RenderComponents1( Create form the same CCSpriteBatchNode)                        Components2                        ....                 GameObject_sub2 (CCNode; Create from the CCNode,the node's parent is GameObject_Parent )                       RenderComponents1( not used batchNode)         Now, GameObject_sub1 not GameObject_Parent node, but I want it to simulate the change of the son is GameObject_Parent;         I Need additional the father's matrix  in child Node ;
add the CocosDenshion project
issue #1733, project-creator for cpp project seems ok
issue #1733, project-creator for lua works.
issue #1733: Updated multi-platform-lua/proj.android/build_native.sh.
Merge pull request #2021 from dumganhar/iss1733-hybrid

issue #1733: Updated multi-platform-lua/proj.android/build_native.sh.
Merge pull request #2020 from walzer/project-creator

tools/project-creator works for lua and cpp templates.
issue #1733: Updated template/multi-platform-lua/proj.win32/HelloLua.sln.
Merge pull request #2022 from dumganhar/iss1733-hybrid

issue #1733: Updated template/multi-platform-lua/proj.win32/HelloLua.sln
Added cleanup and reset methods to ScriptingCore.
Converted tabs to spaces since that seemed to be the predominant choice in this file.
Remove unused access to Android application's cache directory