Merge fix
Merge branch 'hotfix/wrong_password' into develop
uploadMedia for video
Merge branch 'develop' into hotfix/send_group_images
fixed receiving of images
Merge branch 'hotfix/send_group_images'