adding images and plugins
Merge branch 'images' into stage