removed use of BookmarkAlerts. Now use universal Alert
Merge remote-tracking branch 'origin/cal' into calEvents
fixed Alert to carry across location change