add test coverage
add test to #upload_avatar
Merge branch 'master' into test_coverage_2
fix tests
Merge branch 'master' into test_coverage_2
next test update
next test update
Update conversations_controller.rb
update code style
Merge branch 'test_coverage_2'
fix 'test coverage' branch merge issue