making all the changes.
Merge branch 'origin/feature-ds-attendedcheckin'