Cleaned up notification controller a bit.
Merge remote-tracking branch 'origin/master'
Modified `validateResponse` method.