Merge remote-tracking branch 'origin/master'

Conflicts:
	mainproject/Assets/Scripts/Mission 1/CameraShake.cs
	mainproject/Library/CurrentLayout.dwlt
	mainproject/Library/CurrentMaximizeLayout.dwlt
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	mainproject/Library/assetDatabase3
	mainproject/Library/expandedItems
	mainproject/Library/guidmapper
	mainproject/Library/metadata/87/8769af03d751a26429e11304b328c40e
	mainproject/Library/metadata/9e/9e050e288d2185f45a36abb30c679913
	mainproject/mainproject-csharp.sln
	mainproject/mainproject.sln
	mainproject/mainproject.userprefs
Merge remote-tracking branch 'origin/master'
Merge florian
Conflicts:
	mainproject/Assembly-CSharp-Editor-vs.csproj
	mainproject/Assembly-CSharp-Editor.csproj
	mainproject/Assembly-CSharp-vs.csproj
	mainproject/Assembly-CSharp.csproj
	mainproject/Assembly-UnityScript-vs.unityproj
	mainproject/Assembly-UnityScript.unityproj
	mainproject/Assets/Scripts/Mission 1/CameraShake.cs
	mainproject/Assets/Scripts/veel gebruikte scripts/Player.cs
	mainproject/Assets/Scripts/veel gebruikte scripts/Switch.cs
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	mainproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	mainproject/mainproject-csharp.sln
	mainproject/mainproject.sln
	mainproject/mainproject.userprefs