Merge branch 'develop' into feature/NewSettings

Conflicts:
	glm-member-db.php

diff --cc glm-member-db.php
index d634d36,a671b1f..12584ab
--- 1/glm-member-db.php
--- 2/glm-member-db.php
+++ b/glm-member-db.php
@@@ -3,7 -3,7 +3,7 @@@
   * Plugin Name: GLM Members Database
   * Plugin URI: http://www.gaslightmedia.com/
   * Description: Gaslight Media Members Database.
-  * Version: 1.0.20
 - * Version: 1.0.25
++ * Version: 1.0.26
   * Author: Chuck Scott
   * Author URI: http://www.gaslightmedia.com/
   * License: GPL2
@@@ -19,7 -19,7 +19,7 @@@
   * @package glmMembersDatabase
   * @author Chuck Scott <cscott@gaslightmedia.com>
   * @license http://www.gaslightmedia.com Gaslightmedia
-  * @version 1.0.20
 - * @version 1.0.21
++ * @version 1.0.26
   */
  
  /*

diff --cc lib/GlmDataAbstract/DataAbstract.php
Simple merge