Added a method to manage energy computations and added methods for
Francesca Boem
Merge branch 'master' of https://github.com/KTHHVAC/OpenTestbed

Conflicts:
	Software/Matlab/@Signal/GetDevicesIDs.m

Resolved a conflict on GetSignalIDs