Merge Iteration-3-Dev-Notifications

See commit messages. Makes things do words.