conversation fix
Merge branch 'master' of https://github.com/ecubs91/gurume
fix for conversation
fixes
inbox fixes