Merge branch 'develop'

Merging changes for making attendance save more efficient
Fix for issue #6
Merge branch 'master' into develop
Fix for issue #6