Merge branch 'master', remote-tracking branch 'origin'
old NeutronSimHitsAnalyzer: to be modified to include GEM simhits