Started persisting game time
Merge remote-tracking branch 'origin/master'
Merge datamodel
Merge remote-tracking branch 'origin'