ControlCamera, ChangeInterface
Merge branch 'master' of https://github.com/FlorianBasso/RoundSimulator

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/Simulator.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	RoundSimulator-csharp.sln
	RoundSimulator.sln