Keep scope of typedefs consistent
Merge remote-tracking branch 'upstream/master' into develop
Add generic MC track class to SimDecoder
Add counters for number of hits and hits found to MCTrack
Merge remote-tracking branch 'upstream/master' into develop