Merge branch 'master' into multiview

Conflicts:
	css/base/browser.css
	src/JBrowse/Browser.js
	src/JBrowse/GenomeView.js
	src/JBrowse/Store/SeqFeature/NCList.js
	src/JBrowse/Store/SeqFeature/REST.js
	src/JBrowse/View/Dialog/SetHighlight.js
	src/JBrowse/View/Track/BlockBased/Block.js
	src/JBrowse/View/Track/ExportMixin.js
	src/JBrowse/View/Track/HTMLFeatures.js