BRANCH 4.2-106: added gallery widget
BRANCH 2.4-DEV: more dev on image gallery
BRANCH 4.2-DEV: integrated gallery widget into tile widget
BRANCH 4.2-DEV: better integrated gallery_wdg with tile layout
BRANCH 4.2-DEV: some trivial test changes
BRANCH 4.2-DEV: added a new version of video.js ... updated gallery for
video
BRANCH 4.2-DEV: added ability check-in to plugin folder
BRANCH 4.2-DEV: added improvements to the gallery
Merge branch '4.2' into 4.2-106
BRANCH 4.2-106: small fixes with gallery
Merge branch '4.2-106' of https://github.com/southpawtech/TACTIC-DEV into 4.2-106

Conflicts:
	src/tactic/ui/widget/gallery_wdg.py
BRANCH 4.2-106:
   prevented NoneType Exception if a snapshot for a gallery is not found
BRANCH 4.2-106: Removed click from image in gallery.  Added ability to
set from user in sending email.
BRANCH 4.2-106: fixed updates to the gallery when loading videos
BRANCH 4.2-106:
  adjusted the GalleryWdg to show the control bar and description div properly during play-back
Merge branch '4.2' into 4.2-106

added font folder and video-js.css
Merge branch '4.2-106' of https://github.com/southpawtech/TACTIC-DEV into 4.2-106
BRANCH 4.2-DEV: added thumbnail generation for movie files
Merge branch '4.2-106' of https://github.com/southpawtech/TACTIC-DEV into 4.2-106

Conflicts:
	src/tactic/ui/widget/gallery_wdg.py
Merge branch '4.2' into 4.2-106