Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport

Conflicts:
	wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css
	wise-webapp/src/main/webapp/bootstrap/css/bootstrap.min.css
	wise-webapp/src/main/webapp/css/mindmapList.less
	wise-webapp/src/main/webapp/js/mindmapList.js
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp

wise-webapp/src/main/webapp/css/mindmapList.less

@@ -1,7 +1,6 @@
-@import "bootstrap/css/bootstrap.min.css";
 @import "bootstrap/css/bootstrap-colorpicker.min.css";
-@import "bootstrap/css/bootstrap-responsive.min.css";
-@import "css/pageHeaders.css";
+@import "../bootstrap/css/bootstrap.min.css";
+@import "pageHeaders.css";
 
 @html-background: #dedederepeat-xscroll;
 @body-width: 1050px;
@@ -121,6 +120,18 @@ input#selectAll {
 }
 
 .dataTables_length {
+    display: block;
+    height: 34px;
+    padding: 6px 12px;
+    font-size: 14px;
+    line-height: 1.428571429;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
     float: right;
 }
 
@@ -293,7 +304,7 @@ table.tableTag td {
 span.starredOff {
     background: url('../images/star-off.png') no-repeat center left;
     padding: 10px;
-    margin: 0 0px 0 15px;
+    margin: 0 0 0 10px;
 }
 
 span.starredOff:hover {
@@ -303,7 +314,7 @@ span.starredOff:hover {
 span.starredOn {
     background: url('../images/star-on.png') no-repeat center left;
     padding: 10px;
-    margin: 0 0px 0 15px;
+    margin: 0 0 0 10px;
 }
 
 span.starredOn:hover {
@@ -328,4 +339,14 @@ abbr[title] {
 
 #foldersContainer {
     padding-top: 60px;
-}
+}
+
+#footerContainer > ul {
+   padding:0px;
+   margin:0px;
+}
+#footerContainer > li.active {
+   padding:0px;
+   margin:0px;
+}
+

wise-webapp/src/main/webapp/css/pageHeaders.css

@@ -18,14 +18,12 @@ html,body {
 }
 
 #headerToolbar {
-    height: 30px;
+    height: 35px;
     width: 100%;
     background-color: #171a17;
     border-top: 1px solid #999999;
     border-bottom: 1px solid #424141;
     color: white;
-    font-size: small;
-    font-style: normal;
 }
 
 #headerContent {
@@ -38,7 +36,7 @@ html,body {
 }
 
 #headerLogo {
-    margin-top: 18px;
+    margin-top: 23px;
     height: 80px;
     width: 160px;
     background: url("../images/logo-medium.png") no-repeat;

wise-webapp/src/main/webapp/css/pageTemplate.css

@@ -1,5 +1,4 @@
 @import "../bootstrap/css/bootstrap.min.css";
-@import "../bootstrap/css/bootstrap-responsive.min.css";
 @import "pageHeaders.css";
 
 div#register {