CCEGLView
Merge remote-tracking branch 'cocos2d-html5/master' into issue1695_AddDesignedSolutionForMultiResolutions
fixed #1695 add designed resolution for  multi resolution
Merge remote-tracking branch 'cocos2d-html5/master' into issue1695_AddDesignedSolutionForMultiResolutions
fixed #1695 add designed resolution for  multi resolution
add getStringFromFile
Merge pull request #805 from xingsenma/FileUtils

Add supporting for getStringFromFile
cc.UserDefault is with little change usable in JSB
fixed #1695: fixed OpenGLView init.
Merge pull request #809 from linshun/iss1739_bugfix

fixed #1659: fixed OpenGLView init.
Fix issue #1441 from cocos2d-iphone in cocos2d-html5

prevents "bouncing" effect when doing the catmullrom action
Merge pull request #808 from many20/UserDefault_work_in_JSB

cc.UserDefault usable from JSB
Merge pull request #812 from ricardoquesada/catmullrom_interpolation_fix

Fix issue #1441 from cocos2d-iphone in cocos2d-html5
Fixed #1615 let cc.GLProgram compatible with JSB and cc.weglContext rename to cc.renderCotnext
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into iss1615_WebGLRendering

Conflicts:
	HelloHTML5World/src/myApp.js
	cocos2d/CCDirector.js
	cocos2d/actions/CCActionCatmullRom.js
	cocos2d/platform/CCEGLView.js
	template/src/myApp.js
designed resolution for mobile browser
Merge pull request #814 from ShengxiangChen/issue1695_AddDesignedSolutionForMultiResolutions

designed resolution for mobile browser
Fixed #1615 ReImplement CCEGLView for WebGL
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into iss1615_WebGLRendering