fix the include error
Merge branch 'newV3' into improved_glprogram

Conflicts:
	cocos/2d/CCGLProgram.cpp
	cocos/2d/CCGLProgram.h
Improves code a little bit