Fix template
Deprecated simplejson
Fix edit buttons
Merge branch 'master' into anna