mac/CCEGLView moved to desktop/
Merge branch 'develop' into cceglview_in_desktop

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
merge from develop
Unified CCEAGLView on Linux and Mac
code is cleaner
compiles on Linux
Merge pull request #5168 from ricardoquesada/cceglview_in_desktop

Cceglview in desktop