Movement
Merge remote-tracking branch 'origin/Erik' into Niklas
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas

Conflicts:
	Hoverboard/Assets/Script/Obstacles/TriggedObjects/Rails/Grindable.cs
Merge branch 'master' of https://github.com/Raful/Hoverboard into Niklas
HoverBoard 4.0