Merge branch 'feature/chat'
changed rake populate