Merge Fixes for Issue #116

List display for manufacturers now includes contacts and websites where the websites are clickable links.