notification tracking now uses the unix epoch
changed time to a regular nsdate
Merge branch 'master' into notif-tracking-timestamp
Merge branch 'master' into notif-tracking-timestamp
Merge branch 'master' into notif-tracking-timestamp