added calendar and tooltip for meals
pull buy2_stable changes