3d Object creation / adjustment
Roundabout with fountain/trashcans/trees/FPS/FixFlyingObjects
Final
Final
Merge branch 'ceco' into merge

Conflicts:
	Editor/Assembly-UnityScript-firstpass-vs.unityproj
	Editor/Assembly-UnityScript-firstpass.unityproj
	Editor/Assets/Objects/Car/Models/Car/Materials/CAR_Lights.mat
	Editor/Assets/Objects/Scripts/OptieGUI.cs
	Editor/Assets/Objects/Scripts/Road.cs
	Editor/Assets/Resources/PlacedObjects/bibeko-50-T-stuk.prefab
	Editor/Assets/Resources/PlacedObjects/bibeko-50-bocht-klein.prefab
	Editor/Assets/Resources/PlacedObjects/bibeko-50-kruispunt.prefab
	Editor/Assets/Resources/PlacedObjects/bibeko-50-recht.prefab
	Editor/Assets/Scenes/world_1.unity
	Editor/Editor.userprefs
	Editor/Library/CurrentLayout.dwlt
	Editor/Library/CurrentMaximizeLayout.dwlt
	Editor/Library/EditorUserBuildSettings.asset
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Editor/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Editor/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Editor/Library/assetDatabase3
	Editor/Library/expandedItems
	Editor/Library/guidmapper
	Editor/Library/shadercompiler-1.log
	Editor/ProjectSettings/QualitySettings.asset
final
Resolve merge conflicts
Merge branch 'Simon' into merge

Conflicts:
	Editor/Editor.userprefs
	Editor/Library/CurrentLayout.dwlt
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Editor/Library/assetDatabase3