Merge branch 'release-3.1'

Conflicts:
	webapp/components/create_comment.jsx

webapp/sass/components/_mentions.scss

@@ -13,10 +13,10 @@
     @include clearfix;
     cursor: pointer;
     font-size: 13px;
-    height: 36px;
-    line-height: 36px;
-    margin: 5px 0;
-    padding: 2px;
+    height: 39px;
+    line-height: 35px;
+    margin: 0;
+    padding: 3px 8px;
     position: relative;
     white-space: nowrap;
     width: 100%;