Merge pull request #155 from lbl-srg/master

Corrected malformed html
Merge branch 'master' into districtsLoad
Added conversion script from 1.4 to 1.5
Changed one instance of <code>Modelica.Fluid.Sources.MassFlowSource_T</code>  that was connected to the two fluid streams, to two instances, each having half the mass flow rate. This is required for the model to work with Modelica 3.2.1 due to the change introduced in https://trac.modelica.org/Modelica/ticket/739.
Updated reference result due to changes in example model.
Updated icon.
Updated icon.
Updated package.order
Revised documentation.
Added missing script for example, and removed unrequired example. Corrected instanciation of expandable connector.
Removed userGuide to Resources/Documentation/userGuide to fix issue #145
Moved src of user guide to Buildings/Resources/Documentation/userGuide/source and updated Makefile.
Corrected path to mathjax javascript.
Added link to edit page on github.
Merge branch 'master' into districtsLoad
Revised model for debugging to decouple the electrical system from the load.
Updated input file for regression model. Various quantities are still non-physical, including QCoo
Redesigned shade model to separate radiation from convection.
Redesigned window heat transfer implementation to separate convection from radiation on the room side.
Implemented separation of convection and radiation for room-side window heat balance.

This change is needed to implement a CFD model in the room model.