Merge branch 'saw_decoding' of ssh://wood/home/saw/ROOT/hcana into saw_decoding

Conflicts:
	podd
	src/THcHitList.cxx

src/THcHitList.cxx

@@ -11,6 +11,8 @@
 //////////////////////////////////////////////////////////////////////////
 
 #include "THcHitList.h"
+#include "THaEvData.h"
+#include "THaDetMap.h"
 #include "TClonesArray.h"
 
 using namespace std;