killed margin around editor
Merge branch 'master' into tatsu