fixing the return labels in op. toString() in the class Building
Merge origin/master