Controller.cpp moddified to work with other branches

Merge request reports

Loading