smal updates
resolve conflicts
Merge branch 'topic_diffAnalysisAndUnfolding' of github.com:amarini/h2gglobe into topic_diffAnalysisAndUnfolding
Merge branch 'topic_diffAnalysisAndUnfolding' of github.com:amarini/h2gglobe into topic_diffAnalysisAndUnfolding
update to run cross-checks