new plugin layout
resolive conflict
Merge branch 'master' of https://github.com/yungookim/dispeakable.me