Merge Filip's latest development

This merges the latest files from Filip.
It replaces https://github.com/lbl-srg/modelica-buildings/pull/202/files which is agains the master instead of the development branch.