renames method for calories today
refines calorie implementation
fix possible nil error for calories summation
Merge branch 'calories' into statistics