Added contact search and embedded video to both. Various tweaks.
Merge remote-tracking branch 'origin/WorkingBranch'