Add protein and fiber columns to the calculator
Merge branch 'columns' into develop

* columns:
  Add protein and fiber columns to the calculator