manual merges and hot fixes for integrating new data integration branch

package-lock.json

src/app/app.module.ts

...p/components/analysis-panel/analysis-panel.component.html

...app/components/analysis-panel/analysis-panel.component.ts

...nents/analysis-panel/prot-table/prot-table.component.html

...ponents/analysis-panel/prot-table/prot-table.component.ts

src/app/components/info-tile/info-tile.component.html

src/app/components/network/network.component.ts

src/app/components/query-tile/query-tile.component.ts

...onents/quick-drug-target/quick-drug-target.component.html

src/app/config.ts

...dd-expressed-proteins/add-expressed-proteins.component.ts

...pp/dialogs/custom-proteins/custom-proteins.component.html

...pp/dialogs/custom-proteins/custom-proteins.component.scss

src/app/dialogs/custom-proteins/custom-proteins.component.ts

src/app/dialogs/launch-analysis/launch-analysis.component.ts

src/app/interfaces.ts

src/app/main-network.ts

src/app/pages/explorer-page/explorer-page.component.html

src/app/pages/explorer-page/explorer-page.component.ts