saperated ocean
current state
Merge branch 'master' of https://github.com/GuidoSchmidt/EZRWS1314

Conflicts:
	resources/scenes/dae/house.dae
Merge branch 'master' of https://github.com/GuidoSchmidt/EZRWS1314

Conflicts:
	resources/shader/forward/forward.fs.glsl
trying to make translucency working
Merge branch 'master' of https://github.com/GuidoSchmidt/EZRWS1314

Conflicts:
	resources/shader/forward/forward.fs.glsl
GOAT added