Merge branch 'release/1.0.7'

diff --cc glm-member-db/views/front/members/list.html
index b00a183,8b6eb60..0c6cef1
--- 1/glm-member-db/views/front/members/list.html
--- 2/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@@ -737,30 -742,4 +742,4 @@@
  
          </div><!-- glm-member-list-inner-wrapper-->
      </div><!-- glm-member-db-list-view -->
--{include file='front/footer.html'}
- {if apply_filters('wp-is-current-page', 'manufactured-homes-and-michigan-modular-homes') == false }
- <div id="manufacturers-brands-container">
-     {$blocks = apply_filters('glm_blocks', '')}
-     {if $blocks}
-         {foreach $blocks as $block name="glm_block"}
-             {if $smarty.foreach.glm_block.index % 3 == 0}
-                 <div class="glm-row">
-             {/if}
-                     <div class="manufacturer-brand glm-small-12 glm-medium-4 glm-column">
- 
-                         {if $block->url}
-                             <a href="{$block->url}">
-                         {/if}
-                         {apply_filters('glm_block_image', $block->ID)}
- 
-                         {if $block->url}
-                             </a>
-                         {/if}
-                     </div>
-             {if $smarty.foreach.glm_block.index % 3 == 2}
-                 </div>
-             {/if}
-         {/foreach}
-     {/if}
- </div>
- {/if}
++{include file='front/footer.html'}

diff --cc style.css
index 58bf033,d8cf348..4ff531e
--- 1/style.css
--- 2/style.css
+++ b/style.css
@@@ -3,5 -3,5 +3,9 @@@ Theme Name: BrewbakersHousingR
  Author: Gaslight Media
  Author URI: http://www.gaslightmedia.com
  Description: A theme for BrewbakersHousingRV
++<<<<<<< HEAD
 +Version: 1.0.6
++=======
+ Version: 1.0.7
++>>>>>>> release/1.0.7
  */