Merge branch 'ollieh-master'
Merge branch 'ollieh-master'
Merge branch 'ollieh-master'
Allow user to set nospam
Readd friend profiles
Typing status changes