Separated Avatar game- and domain-logic
Added and integrated IAvatarBehaviour
Modified AvatarTest to use NUnit and Moq
Added obstacle and multiple test changes
Fixed test issues
Fixed failing tests due to incorrect StateManager
Removed unsed Assets/CodeCSharp (previously UUnit)
Added Obstacle test implementation
Fixed typo in IObstacleBehaviour
Minor fixes
Merge branch 'master' into arch-refactor-2

Conflicts:
	Assets/CodeCSharp/XAppleC.cs.meta
	Assets/CodeCSharp/XAppleCTest.cs.meta
	Assets/Scripts/Avatar.cs
	Assets/Scripts/AvatarBehaviour.cs.meta
	Assets/Scripts/IAvatarBehaviour.cs.meta
	Assets/Scripts/Level.cs.meta
	Assets/Scripts/Tests.meta
	Assets/Scripts/Tests/LevelTest.cs.meta
Cleaned up code and refactored tests for NUnit
Merge branch 'master' of https://github.com/TiddoLangerak/Context-groep-3

Conflicts:
	Assets/Scripts/Avatar.cs
	Assets/Scripts/Obstacle.cs
	Assets/Tests/AvatarTest.cs
	Library/expandedItems
Merge branch 'master' into arch-refactor-3

Conflicts:
	Assembly-CSharp-Editor-firstpass-vs.csproj
	Assembly-CSharp-Editor-firstpass.csproj
	Assembly-CSharp-Editor-firstpass.pidb
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.pidb
	Assembly-UnityScript.unityproj
	Assets/Scenes/level.unity
	Assets/Scripts/Avatar.cs
	Assets/Scripts/LevelGenerator.cs.meta
	Assets/Scripts/Tests/AvatarTest.cs.meta
	Assets/Scripts/Tests/LevelTest.cs
	Assets/Scripts/Tests/LevelTest.cs.meta
	Assets/Scripts/Tests/MockedLevelBehavior.cs
	Assets/Scripts/Tests/MockedLevelBehavior.cs.meta
	Assets/Scripts/Tests/ObstacleTest.cs.meta
	Assets/Scripts/Tests/StateManagerTest.cs.meta
	Assets/Tests.meta
	Library/InspectorExpandedItems.asset
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Recovered code
added files changed by unity
Merge branch 'arch-refactor-3'

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Contextproject-csharp.sln
	Contextproject.sln
	Library/assetDatabase3
	Library/guidmapper
updated local masterbranch
updated gitignore
Updated local masterbranch