update
Merge branch 'master' of github.com:h2gglobe/h2gglobe into test_cic
update for one vhhad
initialize norm
Merged pull request #231 from martinamalberti/tagme_cic_review_23102013

Conflicts:
	Macros/makeEffAcc.py