Merge pull request #1055 from dingpinglv/Iss_FixBuildxmlBug

fixed a bug that engine can't load from single engine file
fixed #2497 : setSearchPaths Bug
Merge pull request #1063 from dingpinglv/Iss2481_RewriteRenderTexture

Fixed #2481 Re-write Canvas Mode of RenderTexture to adapt WebGL interface
Merge pull request #1062 from ShengxiangChen/issue2497_setSearchPathsBug

fixed #2497: setSearchPaths bug
fixed #2497 : setSearchPaths Bug
Fixed #2444 Re-write cc.Texture for Canvas Mode. Texture2D was used Image/Canvas instead on Canvas Mode , now rewritten it.

Conflicts:
	cocos2d/misc_nodes/CCRenderTexture.js
	cocos2d/sprite_nodes/CCSprite.js
	extensions/GUI/CCControlExtension/CCScale9Sprite.js
 Fixed #2444 Split  cc.Texture2D  as cc.Texture2DWebGL and cc.Texture2DCanvas
 Fixed #2444 Fixed bug that cc.PointZero use as a value ,but it is a function.
Fixed #2444 Fixed some bug about merged the code
Merge pull request #1064 from ShengxiangChen/issue2497_setSearchPathsBug

fixed #2497 : setSearchPaths Bug
Merge pull request #1067 from xingsenma/develop_texture2D

Refactor #2444: Re-write cc.Texture for Canvas Mode
Fixed #2496  Fixed a bug of cc.TextureCache that the status of texture is wrong in callback
Merge pull request #1068 from xingsenma/develop_textureCache

Fixed #2496 Fixed a bug of cc.TextureCache that the status of texture is wrong in callback
Fixed #2482 Add the deprecated information to function of cc.UserDefault
Fixed #2482 Add the deprecated information to function of cc.UserDefault
Merge pull request #1069 from xingsenma/develop_ccUserDefault

Fixed #2482 Add the deprecated information to function of cc.UserDefault
fixed the bug of ScrollView while change the position of it`s parent node.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into forScrollView
Merge pull request #1070 from SmallAiTT/forScrollView

Bug of ScrollView
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5