Resolve last issues
Merge branch 'feature/add_attachment_displaying' into develop