Child table extended.
Checkpoint commit
Merge remote-tracking branch 'marvin/master'
With nutrition placeholders (`a la report view)
Nutr!
Merge remote-tracking branch 'rev/master'
ui stuff

ui stuff