Merge branch 'develop' into feature/Canonical

diff --cc glm-member-db.php
index fdb4ade,0fb3f0b..c75b940
--- 1/glm-member-db.php
--- 2/glm-member-db.php
+++ b/glm-member-db.php
@@@ -19,21 -19,9 +19,21 @@@
   * @package glmMembersDatabase
   * @author Chuck Scott <cscott@gaslightmedia.com>
   * @license http://www.gaslightmedia.com Gaslightmedia
-  * @version 1.0.28
+  * @version 1.0.29
   */
  
 +/*
 + *  Plugin and Database Versions
 + *
 + *  Note that the database version matches the version of the last
 + *  plugin version where there was a change in the database.
 + *
 + *  Updates to checkDatabase() in glmPluginSupport.php must be
 + *  made together with the DB_VERSION below.
 + */
 +define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.28');
 +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.0.28');
 +
  /*
   * Copyright 2014 Charles Scott (email : cscott@gaslightmedia.com)
   *

diff --cc models/front/members/list.php
Simple merge