fixed no effect with stopping tween between two frames
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
change tab to 4 space
change tab to 4 space
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

Conflicts:
	external
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Squashed commit of the following:

commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:37:58 2014 -0700

    little fixes in project

commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:33:11 2014 -0700

    CopyTemplates working

commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:22:05 2014 -0700

    Re-adds CopyTemplate to VS solution

commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 16:40:22 2014 -0700

    Updated shaders

    and project fixes
Merge pull request #6784 from ricardoquesada/wp8_fixes_squash

Fixes for WP8
Fixes android build issues

also restores file for VS
Merge pull request #6785 from ricardoquesada/ooops_android_fixes

Fixes android build issues
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #16 from cocos2d/v3

update cocos2d-x
Merge pull request #6786 from CocosRobot/update_cocosfiles_1400289505

[AUTO][ci skip]: updating cocos2dx_files.json
Updates the config files for luabindings.
Merge pull request #6787 from dumganhar/v3

Updates the config files for luabindings.