nnn
aaaaaa
Merge branch 'Wu_branch' of https://github.com/heguanyu/WebGLWaterShader into Wu_branch

Conflicts:
	VirtualGlobe/WebContent/frag_globe.js
	VirtualGlobe/WebContent/index.html
	src/.idea/workspace.xml
	src/index.html
change upaxis to Y axis