added feature_calc for naive bayes
fixed merges