rename method for find conversation
refactoring create_message method
l18n
Merge remote-tracking branch 'origin/master'