Changes made to ImagesJS and to the site
Merge remote-tracking branch 'origin/develop' into develop