Fixing merging issues

Now compiles with GCC >= 4.8
Replaced vertexDeclaration in TerrainRend. by VertexDeclaration::Get