Merge of upstream master + image path fix in help.html

This pull fixes the images not loading properly and also includes the images from upstream master.