Changed default nbr of threads for cuff-stuff
Updating resource usage for milou
Merge remote-tracking branch 'origin/prepareForMilou' into prepareForMilou