local modifications for debug purposes
Merge branch 'master' of https://github.com/KTHHVAC/OpenTestbed

Conflicts:
	Software/Matlab/RunIFAC2014Controller.m

resolved a conflict
Merge branch 'master' of https://github.com/KTHHVAC/OpenTestbed

necessary because I made parallel modifications of 1 file
added some debug code for the solar radiation converter