ReleaseMerge
ReleaseMerge

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
Merge branch 'master' into gui_edit

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
CountSlider Startwert

Geändert von 1 auf 10.
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit
Bugfix
Merge branch 'master' into charakter_edit

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
Added In-Game-GUI
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/Project-csharp.sln
	Project/Project.sln
	Project/ProjectSettings/EditorBuildSettings.asset
Bugfix
InGameGUI is now available in Scenes and is working
ReleaseMerge

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln