functional email changes
Merge remote-tracking branch 'upstream/master' into 19621
notif cleanup
Merge remote-tracking branch 'upstream/master' into 19621
notif cleanup
whitespace fixes
Merge pull request #124 from joanneci/19621

19621
quick bidding notif fix
Merge pull request #125 from joanneci/19621

quick bidding notif fix
Merge branch 'master' of https://github.com/highfidelity/worklist into 19707

Conflicts:
	classes/Notification.class.php