Fixed clicking notifications not taking you to the chat
Merge branch 'ollieh-master'