minor updates
Merge branch 'master' of github.com:ETHZ/MPAF

Conflicts:
	analysis/analyzers/SUSYSSDL.cc