fixed weird nullPointerExeption when creating new conversations
Merge branch 'tmp' into dev
optimized imports + formatted code
fixed error on conversation updates