presentation adjusted
Merge branch 'NewEditor'
tmp files removed