Fix package.json and shrinkwrap stuff for charts.
resolving conflicts, going with master
fixed (non) conflict and apparently added entity_landing_views and industry_landing_contributions?
merged with origin, fixed (non) conflict