Typos and hrefs to all images, a new image convertifi
Merge branch 'staging'