Added hook for per-feature filtering when rendering tracks. Conflicts:
Added hook for per-feature filtering when rendering tracks.
Conflicts:

	src/JBrowse/View/Track/HTMLFeatures.js

GMOD/jbrowse,erasche/jbrowse,SuLab/jbrowse,igemsoftware/Shenzhen_BGIC_0101_2013,limeng12/jbrowse,SuLab/jbrowse,nathandunn/jbrowse,SuLab/jbrowse,igemsoftware/Shenzhen_BGIC_0101_2013,Arabidopsis-Information-Portal/jbrowse,limeng12/jbrowse,Arabidopsis-Information-Portal/jbrowse,igemsoftware/Shenzhen_BGIC_0101_2013,SuLab/jbrowse,SuLab/jbrowse,limeng12/jbrowse,nathandunn/jbrowse,Arabidopsis-Information-Portal/jbrowse,Arabidopsis-Information-Portal/jbrowse,limeng12/jbrowse,erasche/jbrowse,SuLab/jbrowse,erasche/jbrowse,GMOD/jbrowse,erasche/jbrowse,igemsoftware/Shenzhen_BGIC_0101_2013,erasche/jbrowse,erasche/jbrowse,GMOD/jbrowse,limeng12/jbrowse,nathandunn/jbrowse,erasche/jbrowse,igemsoftware/Shenzhen_BGIC_0101_2013,igemsoftware/Shenzhen_BGIC_0101_2013,Arabidopsis-Information-Portal/jbrowse,igemsoftware/Shenzhen_BGIC_0101_2013,GMOD/jbrowse,GMOD/jbrowse,Arabidopsis-Information-Portal/jbrowse,limeng12/jbrowse,igemsoftware/Shenzhen_BGIC_0101_2013,nathandunn/jbrowse,Arabidopsis-Information-Portal/jbrowse,erasche/jbrowse,nathandunn/jbrowse,limeng12/jbrowse,SuLab/jbrowse,limeng12/jbrowse