More work for join request Trello 185
Merge remote-tracking branch 'origin/feature/diabetes-all' into feature/diabetes-all