sky texturen verbessert
amounts
day and night neu
added ocean
Merge branch 'master' of https://github.com/GuidoSchmidt/EZRWS1314

Conflicts:
	resources/textures/common/water.jpg
	src/scene/Sun.cpp