Fix template
Deprecated simplejson
Fix edit buttons
Add descriptions in template view
Merge branch 'master' into virtio