Update mapp and analysFlag
Fix unmergeMerge branch 'develop'

Conflicts:
	EN_Go4/TArtProc.cxx~
	EN_Go4/TArtUnpackEvent.h~
	EN_Go4/analysisFlag.h~
	map/mapping.map