merged in job-classification branch from mauro
missed some files
fixed merge
fixed merge conflicts
merge fixes
Merge branch 'performance-tuning' into performance-tuning-plus-job-classification