works on iOS, Mac and win32
Merge remote-tracking branch 'cocos2d/v3' into works_ios_win32

Conflicts:
	samples/LiquidFun/Classes/GLES-Render.cpp
	samples/LiquidFun/Classes/GLES-Render.h
	samples/LiquidFun/proj.ios_mac/LiquidFun.xcodeproj/project.pbxproj
Merge pull request #1 from ricardoquesada/works_ios_win32

works Ok on iOS, Mac and Win32