bearbeitung scene und ingame fertig
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit

Conflicts:
	Project/Assembly-CSharp-firstpass-vs.csproj
	Project/Assembly-CSharp-firstpass.csproj
	Project/Assembly-CSharp-vs.csproj
	Project/Assembly-CSharp.csproj
	Project/Assets/Materials/tile_pipeGrey_dff.mat.meta
	Project/Assets/Scripts/GUI Scripts/GUI_Ingame.js
	Project/Project-csharp.sln
	Project/Project.sln
bla
inserted new IngameGUI
Merge branch 'char'

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
Controlling now works