Merge remote-tracking branch 'origin/developerH' into developer

src/main/webapp/static/modules/cmClubData/cmClubData.css

@@ -8,8 +8,9 @@
 }
 .flex-header{
     width: 1000px;
-    height: 340px;
+    min-height: 100px;
     box-sizing: border-box;
+    float: left;
 }
 .flex-header-main{
     width: 100%;
@@ -18,6 +19,7 @@
     border:1px solid rgba(192,192,192,0.4);
     border-radius: 8px;
     padding: 10px 15px;
+    float: left;
 }
 .header-main-box{
     width: 50%;