Merge branch 'master' into rails4

Author: elia

spec/features/smoke_spec.rb

@@ -240,7 +240,8 @@
                 :from => offset + 1, :to => offset + collection_size
 
             pagination_information = page.find('.pagination_information').native.to_s.gsub(nbsp,' ')
-            pagination_information.should include(display_total_text.gsub(' ', ' '))
+            display_total_text.gsub!(/&(#160|nbsp);/, ' ')
+            pagination_information.should include(display_total_text)
           end
         end
       end