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 branch 'refs/heads/master' into project-creator
Merge from upstream to origin
Ignore 'DerivedData' directory
Add 'setFont' and 'setAnchorPoint' to CCEditBox
Move height adjustment code from 'getRect' to 'keyboardWillShow'
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into project-creator
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 ;
issue #1733, unify package name to org.cocos2dx.hello* lower case on both android & ios.
issue #1733, improve the help description of create_project.py
Merge pull request #2014 from walzer/project-creator

unify package name to org.cocos2dx.hello* on both ios and android
fixed #1730: Binds CCScrollView and CCTableView to js.
Merge pull request #2015 from dumganhar/iss1730-bind-scrollview

fixed #1730: Exposed CCScrollView and CCTableView to js.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2016 from CocosRobot/updategeneratedsubmodule_1361413471

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
add the CocosDenshion project
issue #1733, project-creator for cpp project seems ok