commit with some changes to users models, calories views, users views