Merge branch 'develop' into feature/follow-buttons

Conflicts:
	app/models/track_mailer.rb
	app/models/track_thing.rb

1 files changed, 7 insertions, 7 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a0f16dfaf..df89a372c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -32,14 +32,14 @@ module ApplicationHelper
                   html[key] = 'errorExplanation'
               end
           end
-          
+
           error_messages = []
           for object in objects
               object.errors.each do |attr, message|
                   error_messages << content_tag(:li, message)
               end
           end
-          
+
           content_tag(:div,
               content_tag(:ul, error_messages),
             html
@@ -48,7 +48,7 @@ module ApplicationHelper
             ''
         end
     end
-    
+
     # Highlight words, also escapes HTML (other than spans that we add)
     def highlight_words(t, words, html = true)
         if html
@@ -70,10 +70,10 @@ module ApplicationHelper
         t = highlight_words(t, words, html)
         return t
     end
-	
+
     def locale_name(locale)
         return LanguageNames::get_language_name(locale)
-    end  
+    end
 
     # Use our own algorithm for finding path of cache
     def foi_cache(name = {}, options = nil, &block)
@@ -100,11 +100,11 @@ module ApplicationHelper
     def sanitized_object_name(object_name)
         object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/,"_").sub(/_$/,"")
     end
- 
+
     def sanitized_method_name(method_name)
         method_name.sub(/\?$/, "")
     end
- 
+
     def form_tag_id(object_name, method_name, locale=nil)
 	if locale.nil?
             return "#{sanitized_object_name(object_name.to_s)}_#{sanitized_method_name(method_name.to_s)}"