Merge remote-tracking branch 'remotes/origin/SceneManagement' into feat_Ti_Ca
Merge remote-tracking branch 'remotes/origin/SceneManagement' into feat_Ti_Ca
next try to fix shadermaterial
Merge branch 'feat_Ti_Ca' of https://github.com/FUSEEProjectTeam/Fusee into feat_Ti_Ca
MageShader fixed
Merge. Post-merge necessary.
sonstwas
sonstwie 2
Merge branch 'sonstwie' of https://github.com/FUSEEProjectTeam/Fusee into sonstwie
Post-merge fixes.
Added new input method
some changes in main.cs
Shaders inc
Merge branch 'sonstwie' into develop

WebBuild does not work! Mage does not work without VS!

Conflicts:
	src/Engine/Imp/WebGL/Scripts/Fusee.Engine.Imp.WebGL.js
New submodule with two bugfixes
shader inc post merge fix
Merge remote-tracking branch 'origin/develop' into feat_Material_Timon

Conflicts:
	src/Engine/Core/MoreShaders.cs
	src/Engine/Core/ShaderMaterial.cs
	src/Engine/Examples/EgoPerspective/Main.cs
	src/Engine/Imp/WebGL/Scripts/Fusee.Engine.Imp.WebGL.js