Merge pull request #117 from lbl-srg/master

Merge master to openmodelica branch.
Merge branch 'master' into openmodelica
Merge pull request #120 from lbl-srg/master

Bugfix for BCVTB.
Changed the redeclaration of <code>vol2</code> to be replaceable.
Changed record declaration to be a parameter.
Changed record declaration to be a parameter.