mindre error
Merge branch 'master' into design

Conflicts:
	Assets/SpaceShip.unity
	Assets/Standard Assets.meta
	Assets/Terrain/July_terrain.asset
	Assets/Terrain/Juni_Terrain.asset
	Assets/Terrain/New Terrain 4.asset