fixed statics
Merge branch 'master' into Memento
fixed lots of stupid little mistakes
cosmetic changes (::sptr)
cosmetic QString cleanup
cosmetic QString changes
Merge branch 'Memento'
Merge branch 'XMLSaver'
Compiles