pull to retrive the code
Merge branch 'master' of https://github.com/KTHHVAC/OpenTestbed

Conflicts:
	Software/Matlab/+Controller/@Controller/Controller.m
	Software/Matlab/+Controller/@DeterministicCO2MPC/ComputeControlInputs.m
	Software/Matlab/+Controller/@DeterministicCO2MPC/DeterministicCO2MPC.m
	Software/Matlab/+Controller/@DeterministicCO2MPC/SetConstraints.m
	Software/Matlab/+Controller/@DeterministicCO2MPC/SetCostParameters.m

Software/Matlab/+Controller/@DeterministicCO2MPC/SetLinearModelMatrices.
m
	Software/Matlab/+Controller/LoadDefaultDeterministicMPCParameters.m
	Software/Matlab/+Controller/LoadDeterministicCO2MPCParameters.m
	Software/Matlab/+Controller/LoadDeterministicTemperatureMPCParameters.m
	Software/Matlab/+Controller/LoadPIControllerParameters.m
	Software/Matlab/Models/BuildingCO2SystemMatrix.m
	Software/Matlab/main_debug.m