Merge remote-tracking branch 'remotes/origin/feature/option__Profile_Photo_Uploader'

# Conflicts:
#	includes/admin/core/class-admin-settings.php

includes/admin/core/class-admin-settings.php

@@ -782,6 +782,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 									'tooltip'     	=> __('You can change the default cover photo globally here. Please make sure that the default cover is large enough and respects the ratio you are using for cover photos.', 'ultimate-member'),
 									'upload_frame_title'=> __('Select Default Cover Photo', 'ultimate-member'),
 								),
+								array(
+									'id'        => 'disable_profile_photo_upload',
+									'type'      => 'checkbox',
+									'label'     => __( 'Disable Profile Photo Upload', 'ultimate-member' ),
+									'tooltip'   => __( 'Switch on/off the profile photo uploader', 'ultimate-member' ),
+								),
 								array(
 									'id'      		=> 'profile_photosize',
 									'type'     		=> 'text',