Merge branch 'badges' into eip-develop

app/views/badges/_badge.html.erb

@@ -11,7 +11,7 @@
     <% end %>
     <%= badge.title unless is_small %>
   </span>
-  <span class="tooltip-text">
+  <span style="white-space: normal;" class="tooltip-text">
     <%= is_small ?
           "This user has been awarded the '#{badge.title}' badge."
           : badge.description %>