scene has ocean
improved texture loading using dds textures
Merge branch 'master' of https://github.com/GuidoSchmidt/EZRWS1314

Conflicts:
	src/EZR.cpp
Merge branch 'master' of https://github.com/GuidoSchmidt/EZRWS1314

Conflicts:
	resources/shader_source/final.frag.glsl
	src/EZR.cpp
	src/renderer/Renderer.cpp
	src/utils/Importer.cpp
Resolution settings in settngs.h, render fullscreen also