CCscrollView screenPos also needs to be adjusted by the scale in order to be used with Retina display.
MAC project is missing the header search path to /include
Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors.
Merge branch 'gles20' of https://github.com/FlowerpotGames/cocos2d-x into gles20
Android JAVA refactoring. Android JNI Cleanup.
Remove optimization of the mac debug build
Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20

Conflicts:
	extensions/GUI/CCScrollView/CCScrollView.cpp
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
Merge with gles20-official.
Minor build fix due to merge fail.
delete CCDirector after call CCDirector::purgeDirector()
[Mac] fix CCLuaLog crash
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Added proper JNIEXPORT/JNICALL markers to android platform jni bindings.
OpenGL access violation fix
Revert "OpenGL access violation fix"

This reverts commit 7eb0e3397d1468e042b75ab4e0d6a2b83206d343.
OpenGL access violation fix
Added ANDROID_SCRIPTINGCORE_LOAD_SCRIPTS_FROM_EXTERNAL_ASSET_DIRECTORY flag, that allows to load from external assets directory instead of from internal apk assets directory.
avoid unused memory alloc