micro-editor update, add entry fix
Merge remote-tracking branch 'origin/master'