water + specular
Merge branch 'chunked_display' of https://github.com/Jijidici/Hydro-Gene_IMAC2014 into chunked_display

Conflicts:
	shaders/norm.fs.glsl