Merge branch 'feature/comments' into deploy
Fixing comment null user name
Merge branch 'deploy' into feature/comments