Merge timeline database and regular database
Start timeline recording and upload when user logs in
Pimped-up about window
Check for update on About window show
Today and yesterday headers in caps
Fix mac build
Merge branch 'master' into builds
7.0