Merge branch 'master'
Initial 4
Merge branch 'LocalDietController'