Merge dev-common and various fixes to achieve compilation

- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio

1 files changed, 1 insertions, 1 deletions

diff --git a/src/ui/color.h b/src/ui/color.h
index c282429..ad99ddd 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
+#include "ui/control.h"
 
-#include "control.h"
 
 namespace Gfx{
     class CEngine;