Merge remote-tracking branch 'origin/Simon' into Rudi-de-baas

Conflicts:
	Editor/Assets/Resources/PlacedObjects/bibeko-50-recht.prefab
	Editor/Editor.userprefs
	Editor/Library/CurrentLayout.dwlt
	Editor/Library/CurrentMaximizeLayout.dwlt
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Editor/Library/assetDatabase3
	Editor/Library/expandedItems
	Editor/Library/shadercompiler-1.log