Merge branch 'develop' into feature/lauryAdminPolishing

diff --cc css/admin.css
index 69dc71f,c74e49d..9aa9cd4
--- 1/css/admin.css
--- 2/css/admin.css
+++ b/css/admin.css
@@@ -488,50 -408,14 +488,60 @@@ input[type=submit], input[type=file] 
      font-weight: 400;
  }
  
 -
 +/* Dashboard Widgets for the Members Only */
 +#glm-dashboard-widgets-wrap {
 +    margin: 0 -8px;
 +    overflow: hidden;
 +}
 +.glm-widget-container {
 +    display: inline-block;
 +    width: 45%;
 +    float: left;
 +    margin: 0 10px 20px;
 +}
 +.glm-widget {
 +    min-width: 255px;
 +    border: 1px solid #e5e5e5;
 +    box-shadow: 0 1px 1px rgba( 0, 0, 0, .04);
 +    background: #fff;
 +}
 +.glm-widget-content {
 +    padding: 20px;
 +}
 +.glm-widget .glm-widget-content h3 {
 +    padding: 8px 0;
 +}
 +.glm-widget h2 {
 +    font-size: 14px;
 +    padding: 8px 12px;
 +    margin: 0;
 +    line-height: 1.4;
 +    border-bottom: 1px solid #eee;
 +}
 +.glm-widget h3 {
 +    font-size: 12px;
 +    padding: 8px 12px;
 +    margin: 0;
 +    line-height: 1.4;
 +}
 +
 +.glm-widget-container:nth-child(odd) {
 +    clear: left;
 +}
 +
 +@media (max-width: 1200px) {
 +    .glm-widget-container {
 +        width: 90%;
 +        float: none;
 +    }
 +}
+ 
+ .shortcode-option-list span 
+ {
+     display: inline-block;
+     width: 200px;
+ }
+ .shortcode-option-list-title
+ {
+     font-weight: bold;
+ }

diff --cc setup/frontHooks.php
Simple merge