Scheiß git
Merge branch 'master' of https://github.com/stupacki/CA_2014_PROJECT_DATA
Characters now going to the exit, bugfixes needed
Bugfix in Deletmethods, still buggy at respawning
progresssave of bugfixing
So Behaviours mal integriert. Siehe Code comments
Merge branch 'charakter_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into charakter_edit

Conflicts:
	Project/Assets/Crowd Simulation/Characters/Walker.controller
	Project/Assets/Scenes/CharacterEdit Leveldesign.meta
	Project/Assets/Scenes/CharacterEdit Leveldesign.unity
	Project/Assets/Scenes/Test_Scene_charakter_edit.unity
	Project/Assets/Scenes/Test_Scene_charakter_edit/NavMesh.asset
	Project/Assets/Scripts/Charakter Scrips/FindPath.js
	Project/Assets/Scripts/Game Controller/GameController.js
	Project/Assets/Scripts/Game Controller/OverviewCamera.js.meta
	Project/Project-csharp.sln
	Project/Project.sln
Despawning is now active
Merge branch 'charakter_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into charakter_edit

Conflicts:
	Project/Project-csharp.sln
	Project/Project.sln
adaption of FindPath, Methods didnt working, because of merge
Bugfix
Bugfix
Pull
Merge branch 'master' of https://github.com/stupacki/CA_2014_PROJECT_DATA
Leveldesign
Merge branch 'gui_edit' of https://github.com/stupacki/CA_2014_PROJECT_DATA into gui_edit
bugfix
Rollback on last consistent Version
ReleaseMerge
ReleaseMerge

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