Merge branch 'master' into dev_partitioning

kadmos/cmdows/cmdows.py

kadmos/external/XDSM_writer/diagram_styles.tex

kadmos/external/XML_merger/XMLmerger.py

kadmos/graph/graph_data.py

kadmos/graph/graph_kadmos.py

kadmos/graph/graph_process.py

kadmos/graph/mixin_equation.py

kadmos/graph/mixin_vistoms.py

kadmos/knowledgebase/knowledgebase.py

kadmos/utilities/mapping.py

kadmos/utilities/xmls.py

...spack/VISTOMS_TreeViewer/VISTOMS_TreeViewer_datarepl.html

kadmos/vispack/VISTOMS_TreeViewer/include/AGILE_Icon.png

kadmos/vispack/VISTOMS_TreeViewer/include/AGILE_Logo.png

...s/vispack/VISTOMS_TreeViewer/include/Acknowledgements.png

...s/vispack/VISTOMS_TreeViewer/include/Acknowledgements.svg

kadmos/vispack/VISTOMS_TreeViewer/include/Contact.png

kadmos/vispack/VISTOMS_TreeViewer/include/Contact.svg

kadmos/vispack/VISTOMS_TreeViewer/include/Home.png

kadmos/vispack/VISTOMS_TreeViewer/include/Home.svg