refs #530: add title and caption
Merge branch 'master' into feature530
refs #530: git image selection dialog to work with underlying figure
refs #530: figure is the new media
Merge branch 'feature530' into testing

Conflicts:
	src/plugins/oer/assorted/lib/image.js