event building working for griffin.
Resolved conflict.

Merge branch 'master' of github.com:pcbend/GRSISort

Conflicts:
	libraries/TGRSIAnalysis/TNucleus/TNucleusDict.h