Bugfix
Merge

Conflicts:
	Project/Assets/Scripts/Charakter Scrips/FindPath.js
	Project/Assets/Scripts/Game Controller/GameController.js
	Project/Project-csharp.sln
	Project/Project.sln