uppdaterat branchen
Merge branch 'Pontus' of https://github.com/Raful/Hoverboard into Pontus

Conflicts:
	Hoverboard/Assembly-CSharp.csproj
	Hoverboard/Library/InspectorExpandedItems.asset
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll
	Hoverboard/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Hoverboard/Library/assetDatabase3
	Hoverboard/Library/guidmapper
Merge branch 'Pontus' of https://github.com/Raful/Hoverboard into iteration1

Conflicts:
	Hoverboard/Assembly-UnityScript-vs.unityproj
	Hoverboard/Assembly-UnityScript.unityproj
	Hoverboard/Assets/Script/Meny.cs.meta
	Hoverboard/Hoverboard-csharp.sln
	Hoverboard/Hoverboard.sln