latest changes
Merge branch 'master' of github.com:wpfff/diamond-analysis

Conflicts:
	scripts/cr_stats/threshold_analysis.py