Merge branch 'develop' of github.com:topiaruss/cmsplugin-imagesift into develop
tidy