Merge branch 'diff'

src/DynamicModel.cc

src/DynamicModel.hh

src/ExprNode.cc

src/ExprNode.hh

src/ModFile.cc

src/ModFile.hh

src/ModelTree.hh

src/StaticModel.cc

src/SymbolTable.cc