story-4: Referenced correct icon resources.
story-4:Refactored Notification handling to NotificationDispatcher.
story-4:Added assert out of guilt. Need to make class more testable
Merge remote-tracking branch 'origin/story-4'