Merge branch 'master' of /Users/leon/Projects/Carers/ClaimCapture with conflicts.
solution for optional parts that become mandatory