fixed save and edit
Merge branch 'master' of https://github.com/pegesund/testme