[db] changed TimeSetting to store the ConfigureActivity Context
[db] adds storage
Merge remote-tracking branch 'origin/dev' into dan-dev