eb80c07f57
Resolved conflicts: kept HEAD versions of QSS (has later refinements), InitGui.py (has newer origin architecture), and silo submodule.