Added notifications, haven't tested it yet
Merge branch 'master' of https://github.com/nathantross/privy into notifications
Making progress on notifications
Notifications are partially working
Merge branch 'master' into notifications

Conflicts:
	client/views/messages/new.html
	client/views/notes/new.html
Merged commit