Merge branch 'develop' into feature/shortcodeBuilder

Conflicts:
	js/shortcodeBuilder.js

diff --cc js/shortcodeBuilder.js
index 4f5f666,46b38ae..23ce7ad
--- 1/js/shortcodeBuilder.js
--- 2/js/shortcodeBuilder.js
+++ b/js/shortcodeBuilder.js
@@@ -36,8 -27,8 +36,10 @@@ jQuery(document).ready(function ($) 
  //        }
  //      }
  //    }
 -    var shortcode = $("#shortcode_container").not('.glm-dynSelect-item'), clone, id_count;
 -    id_count = 0;
++
 +//    var shortcode = $("#shortcode_container").not('.glm-dynSelect-item'), clone, id_count;
 +//    id_count = 0;
++
  //    $("#additionalShortcode").on( "click", function () {
  //            id_count++;
  //            clone = shortcode.clone(true);
@@@ -122,8 -113,8 +124,9 @@@
          $("#showDetail").dialog().dialog("option", "width", 422);
      });
      
 -//    var regExp = /\[([^)]+)\]/;
 -    var regExp = /glm_members_list_/g;
 +    var regExp = /\[([^)]+)\]/;
 +//    var regExp = /glm_members_list_/g;
++
      function get_tinymce_content(){
          if (jQuery("#wp-content-wrap").hasClass("tmce-active")){
              
@@@ -267,7 -258,7 +270,8 @@@
         } else if ( new_ids.length === 1) {
             id_string = new_ids[0];
         }
 +        
+ 
         if($("#content").css("display") !== "none"){
             editor_content = content.val();
             if(empty_space){
@@@ -284,8 -274,6 +288,9 @@@
                  editor_content = editor_content.replace(ids, 'category="' + id_string + '"' );
                  tinyMCE.activeEditor.setContent(editor_content);
             } else {
 +               var test = tinyMCE.get('glm-members-list_1').getContent();
 +        console.debug(test);
++
                  editor_content = tinyMCE.get('content').getContent({format: 'raw'});
                  editor_content = editor_content.replace('category="' + ids, 'category="' + id_string);
                  tinyMCE.activeEditor.setContent(editor_content);