Added Water texture done by Sahel

Water Texture submitted for Sahel.
Merge branch 'master' of https://github.com/elchan/Terrain_Generation

Conflicts:
	Terrain_Generation.v11.suo
	bin/data/geo.geometryshader
	bin/data/shader.frag
	src/Terrain.hpp
	src/ofApp.cpp
	src/ofApp.h
Merge branch 'master' of https://github.com/elchan/Terrain_Generation

Conflicts:
	Terrain_Generation.v11.suo
	bin/data/geo.geometryshader
	bin/data/shader.frag
	src/Terrain.hpp
	src/ofApp.cpp
	src/ofApp.h
Fixed a conflict with second window ifdefs.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Terrain_Generation.v11.suo
	src/ofApp.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	Terrain_Generation.v11.suo
	src/ofApp.cpp
Fixed noTex() shading.

noTex() shading wasn't displaying the vertex due to culling turning it
off for the drawing into the fbo.
Fixed direction of FOV cone.

- FOV cone fixed.  Inset view matches with Main view.
- 't' flips main view between top and perspective views.
- Still a problem with two extra lobs in FOV cone due to using tan
function to calculate angle from vertex x-y.
Merged the water texture in the Frustum code