Still implementing Direct Messages feature, fixed other Profile bug
Merge remote-tracking branch 'origin/master'