fdaf
Merge branch 'master' of github.com:fkunneman/ADNEXT

Conflicts:
	evaluation/evaluate_window_estimations.py
Merge branch 'master' of github.com:fkunneman/ADNEXT
fdaaf