Proper Commit for the Notification Bug Fix Merge This!

Sorry Marina for all the confusion between the commits and branches but this is the branch you should be merging to master.