small template changes
Merge branch 'master' of https://github.com/Mensen/swa-matlab

local template changes and new save changes