fixxing cmFilesAdapter and Captcha
fixxed all files in app
Merge remote-tracking branch 'origin/feature-files-handling-some-bugs' into feature-conversation-controls