added include for  windows
added uniform type fro distinuish water and box
Merge branch 'master' of https://github.com/remodietlicher/PBSProject

Conflicts:
	ShallowWater/source/main.cpp