Merge branch 'develop' into feature/moderatedMemberUpdates

diff --cc config/plugin.ini
Simple merge

diff --cc models/admin/member/memberInfo.php
index 691a165,0cfd7eb..81fd987
mode 100644,100755..100755
--- 1/models/admin/member/memberInfo.php
--- 2/models/admin/member/memberInfo.php
+++ b/models/admin/member/memberInfo.php

diff --cc views/admin/member/memberInfo.html
index d36c33d,31e3894..c3e1dd8
mode 100644,100755..100755
--- 1/views/admin/member/memberInfo.html
--- 2/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@@ -1,10 -1,13 +1,16 @@@
 +{* View File: memberInfo.html *}
 +{* glm_action: memberinfo *}
 +{* Used for editing member profile records by members_manager or Own Enttity Manager *}
  {include file='admin/member/header.html'}
  
-     <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
-     <script type="text/javascript">var enableDraggable = true;</script>
+     {if $settings.selected_map_interface == 1}
+         <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.3/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
+         <script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js" integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q==" crossorigin=""></script>
+     {/if}
+     {if $settings.selected_map_interface == 2}
+         <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
+         <script type="text/javascript">var enableDraggable = true;</script>
+     {/if}   
  
      <!--[if lt IE 9]>
        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>

diff --cc views/admin/members/list.html
Simple merge