changes to check in refactoring.
Merge branch 'origin/feature-ds-attendedcheckin'