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
mend

scaling works ok on particle demos
Merge pull request #2 from ricardoquesada/scale_ok_squash

scaling works ok on particle demos
compiles in release mode in Win32
Merge pull request #3 from ricardoquesada/win32_rel_mode

compiles in release mode in Win32
Update README.md
Update README.md
liquidfun is a submodule
EyeCandy: work in progress
EyeCandy sort of working on iOS
new version of cocos2d-x
Merge pull request #4 from ricardoquesada/liquidfun_testbed

Liquidfun testbed
Adds LHSprite
removes xcuserstate files
Better description
Merge pull request #5 from ricardoquesada/eyecandy_fixes

Eyecandy fixes
Update README.md

`LF` instead of `LH`
Update README.md