Merge branch 'feature/variantWidget' of https://github.com/opencb/jsorolla into develop

Conflicts:
	src/genome-viewer/genome-viewer.html
	src/genome-viewer/genome-viewer.js
	src/genome-viewer/navigation-bar.js
	src/lib/data-adapter/network/attribute-network-data-adapter.js
	src/lib/data-adapter/network/text-network-data-adapter.js
	src/lib/network/attributes/attribute-manager-store.js
	src/lib/network/circos-vertex-renderer.js
	src/lib/network/default-edge-renderer.js
	src/lib/network/network-session.js
	src/lib/network/network.js
	src/lib/widgets/network/attributes/attribute-edit-widget.js
	src/lib/widgets/network/network-edit-widget.js
	src/lib/widgets/network/text-network-file-widget.js
	src/lib/widgets/opencga/generic-form-panel.js
	src/lib/widgets/opencga/opencga-browser-widget.js
	src/lib/widgets/opencga/upload-widget.js
	src/network-viewer/network-svg-layout.js
	src/network-viewer/network-viewer.html
	src/network-viewer/network-viewer.js