BL-482, backed out putting image dialog on own thread
Make thumbnailer border options be solid, dashed, or none
SHRP_PupilBookExtensionWork
Fix clear formatting (ctrl+space) and add ctrl+u, ctrl+b, and ctrl+i
Allow a collection file to be dragged into the open collection dialog
Make thumbnailer not try to cache images that come with no key
Tweaks of SHRP-Uganda thumbnailing extension classes
Merge branch 'Version2.0'
Merge in drag 'n drop to choose collection
Merge branch 'Version2.0'