fix outline bug
Merge pull request #7252 from visiblelight/beta_test

Fixing compile errors on WP8
Merge pull request #7254 from dabingnn/v3_fix

fix outline bug
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #7255 from CocosRobot/update_cocosfiles_1404120374

[AUTO][ci skip]: updating cocos2dx_files.json
Update the reference of submodule cocos2d-console.
Merge pull request #7256 from natural-law/v3

Update the reference of submodule cocos2d-console.
Merge pull request #7251 from 2youyouo2/v3_current_frame_index

add gotoFrameAndPlay and setCurrentFrame interface
Merge pull request #7253 from super626/v3

c3b loader bug
Merge pull request #7248 from CocosRobot/update_cocosfiles_1404113725

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #7242 from joshuastray/scrollview_fix

fix scrollview crashes on win32 because of variable returned without ini...
[AUTO]: updating luabinding automatically
Merge pull request #7257 from CocosRobot/update_lua_bindings_1404121406

[AUTO]: updating luabinding automatically
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
Merge pull request #7250 from minggo/fix-compiling

fix compiling error
call parent onExit method
Merge pull request #7258 from andyque/fixSchedulerTest

call parent onExit method
move controller support to 'libcontrollerdeleate' project.
update test case.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630

Conflicts:
	tests/game-controller-test/proj.android/project.properties