merging develop changes to master
updating plugins
Merge branch 'master' into develop