Changed material to include a bump image as a parameter.
Included texture offset and repetition for heightmap generation.
Moved several constants from CityMesh to public so they can be used in other classes (like CityCamera).
Changed several textures of grass and water, added enums for easier identification.
Added interpolation of height of camera in walkthrough.
Merge branch 'master' of github.com:chiguire/nttcitygenerator

Conflicts:
	src/nntcity/citymesh.h