added notifications feature--need to update db schema using db/notifications.sql
some bug fix for notifications
Merge branch 'master' into notifications

Conflicts:
	bookmarklet/bookmarkletUserActionUI.js
	css/Circulate_css.css
	templates/header.php
Merge remote-tracking branch 'remotes/origin/notifications'