Merge pull request #6 from southpawtech/4.2

Cumulative updates to 4.2
BRANCH 4.2:
  resolved a conflict in Search
Merge branch '4.2' of https://github.com/Southpaw-TACTIC/TACTIC into 4.2

Conflicts:
	src/pyasm/search/search.py
BRANCH 4.2-106:
  adjusted the GalleryWdg to show the control bar and description div properly during play-back
BRANCH 4.2:
   added font folder and video-js.css
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