add plugins
add plugins
Merge branch 'dev'