Reload Daniel's highlight shader (in ea9463eed78167275379e5892b7c52e91a800003).
Revert "Added highlight shader"

This reverts commit ea9463eed78167275379e5892b7c52e91a800003.
GI-542 : try to create fonts for both otf and ttf font types
GI-556: cherry-pick https://github.com/bmanGH/cocos2d-x/commit/09ae90f
griffin re-org and c++11 changes
GI-564 : Added a dictionary to keep tracks of which fonts we register and checks to see if we are trying to loada  font from path
Merge branch 'gles20' of github.com:brooklynpacket/cocos2d-x into gles20
Revert "Merge branch 'gles20' of github.com:brooklynpacket/cocos2d-x into gles20"

This reverts commit e843797eb66f1d58d1e6890b41ce635faed8e4e9, reversing
changes made to c83a516b5fdeede17a35a2382adb000bee557d99.
merge gles20 into rednova-3d-test

Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
	cocos2dx/shaders/CCGLProgram.h
	cocos2dx/shaders/CCShaderCache.cpp
	cocos2dx/shaders/ccShaders.h
build fixes for rednova-3d-test