Moved terrain rendering to terrain.cpp. Vertex and fragment shaders are now combined in *.glsl files.
Merge remote-tracking branch 'origin/master'