Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

diff --cc classes/glmPluginSupport.php
Simple merge

diff --cc controllers/admin.php
Simple merge

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

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