Merge pull request #25 from will-moore/combine_imgs_9747_develop

Combine imgs 9747 develop
merge develop -D org -I include -E exclude: PR 23 (Kymograph 8206_develop)