diff --git a/app/views/admin/content_types/_form.html.haml b/app/views/admin/content_types/_form.html.haml
index 852558db..5ec59128 100644
--- a/app/views/admin/content_types/_form.html.haml
+++ b/app/views/admin/content_types/_form.html.haml
@@ -6,7 +6,7 @@
   = f.input :name
   = f.input :slug
   = f.input :description
-  
+
 = render 'admin/custom_fields/index', :form => f, :collection_name => 'contents'
 
 - unless f.object.new_record?
@@ -18,5 +18,5 @@
     = f.input :order_by, :as => :select, :collection => options_for_order_by(f.object, 'contents'), :include_blank => false
     = f.custom_input :api_enabled, :css => 'toggle' do
       = f.check_box :api_enabled
-      
-  
+
+
diff --git a/app/views/admin/contents/edit.html.haml b/app/views/admin/contents/edit.html.haml
index a46e1099..d1cde807 100644
--- a/app/views/admin/contents/edit.html.haml
+++ b/app/views/admin/contents/edit.html.haml
@@ -3,7 +3,7 @@
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
 
-- content_for :buttons do  
+- content_for :buttons do
   = admin_button_tag t('admin.contents.index.edit'), edit_admin_content_type_url(@content_type), :class => 'edit'
   = admin_button_tag t('admin.contents.index.new'), new_admin_content_url(@content_type.slug), :class => 'new'
 
diff --git a/app/views/admin/contents/index.html.haml b/app/views/admin/contents/index.html.haml
index 721ffa6d..d4040374 100644
--- a/app/views/admin/contents/index.html.haml
+++ b/app/views/admin/contents/index.html.haml
@@ -2,25 +2,25 @@
 
 - content_for :submenu do
   = render 'admin/shared/menu/contents'
-    
+
 - content_for :head do
   = javascript_include_tag 'admin/contents'
-  
+
 - content_for :buttons do
   = admin_button_tag :edit, edit_admin_content_type_url(@content_type), :class => 'edit'
   = admin_button_tag :new, new_admin_content_url(@content_type.slug), :class => 'new'
 
-- if @content_type.description.present? 
+- if @content_type.description.present?
   %p= @content_type.description
 
 - if @content_type.groupable?
-  - @contents.each do |group|  
+  - @contents.each do |group|
     %h3= group[:name] || t('.category_noname')
-    = render 'list', :contents => group[:items]  
+    = render 'list', :contents => group[:items]
     %br
 - else
   = render 'list', :contents => @contents
-        
+
 = form_tag sort_admin_contents_path(@content_type.slug), :method => :put, :class => 'formtastic' do
   = hidden_field_tag :order
 
diff --git a/app/views/admin/pages/_form.html.haml b/app/views/admin/pages/_form.html.haml
index 61d364c2..90bab1d1 100644
--- a/app/views/admin/pages/_form.html.haml
+++ b/app/views/admin/pages/_form.html.haml
@@ -3,26 +3,26 @@
   = stylesheet_link_tag 'admin/page_parts'
 
 = f.foldable_inputs :name => :information do
-  
+
   = f.input :title
-  
+
   = f.input :layout_id, :as => :select, :collection => current_site.layouts.all.to_a, :input_html => { :data_url => admin_layout_page_parts_url('_id_to_replace_') }
-  
+
   - if not @page.index? and not @page.not_found?
     = f.input :parent_id, :as => :select, :collection => parent_pages_options, :include_blank => false
-      
+
   = f.input :slug, :required => false, :hint => @page.slug.blank? ? ' ' : @page.url, :input_html => { :data_url => get_path_admin_pages_url, :disabled => @page.index? || @page.not_found? }, :wrapper_html => { :style => "#{'display: none' if @page.templatized?}" }
-        
+
   = f.custom_input :templatized, :css => 'toggle' do
     = f.check_box :templatized
-    
+
   = f.input :content_type_id, :as => :select, :collection => current_site.content_types.all.to_a, :include_blank => false, :wrapper_html => { :style => "#{'display: none' unless @page.templatized?}" }
-      
+
   = f.custom_input :published, :css => 'toggle' do
     = f.check_box :published
-    
+
   = f.input :cache_strategy, :as => :select, :collection => options_for_page_cache_strategy, :include_blank => false
-  
+
 #page-parts
   .nav
     - @page.parts.each_with_index do |part, index|
diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml
index eb768406..92eb83a7 100644
--- a/app/views/admin/sessions/new.html.haml
+++ b/app/views/admin/sessions/new.html.haml
@@ -12,6 +12,6 @@
 
     %p.link
       = link_to t('.link'), new_admin_password_path
-        
+
   .footer
     = login_button_tag t('admin.buttons.login')
diff --git a/app/views/admin/shared/_form_actions.html.haml b/app/views/admin/shared/_form_actions.html.haml
index 342fc091..1d936200 100644
--- a/app/views/admin/shared/_form_actions.html.haml
+++ b/app/views/admin/shared/_form_actions.html.haml
@@ -6,10 +6,10 @@
       - elsif defined?(delete_button)
         = delete_button
        
-      
+
   .span-12.last
     %p
       %button.button.light{ :type => 'submit' }
         %span= button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label
-        
+
   .clear
\ No newline at end of file
diff --git a/app/views/admin/shared/_head.html.haml b/app/views/admin/shared/_head.html.haml
index 387d13a3..ee75cc91 100644
--- a/app/views/admin/shared/_head.html.haml
+++ b/app/views/admin/shared/_head.html.haml
@@ -7,7 +7,7 @@
 = stylesheet_link_tag 'admin/blueprint/screen', :media => 'screen'
 / [if IE]
   = stylesheet_link_tag 'admin/blueprint/ie', :media => 'screen'
-  
+
 = stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/menu', 'admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku?
 
 = javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?
diff --git a/app/views/admin/sitemaps/show.xml.builder b/app/views/admin/sitemaps/show.xml.builder
index 68cfa0de..fd91e261 100644
--- a/app/views/admin/sitemaps/show.xml.builder
+++ b/app/views/admin/sitemaps/show.xml.builder
@@ -9,7 +9,7 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
   @pages.each do |page|
     if not page.index_or_not_found?
       if page.templatized?
-        
+
         page.content_type.contents.visible.each do |c|
           xml.url do
             xml.loc page_main_url(page, c)
diff --git a/app/views/admin/snippets/_form.html.haml b/app/views/admin/snippets/_form.html.haml
index 5c0dcc21..0d9c87ff 100644
--- a/app/views/admin/snippets/_form.html.haml
+++ b/app/views/admin/snippets/_form.html.haml
@@ -5,10 +5,10 @@
 = f.inputs :name => :information do
   = f.input :name
   = f.input :slug, :required => false
-  
+
 = f.inputs :name => :code do
   = f.custom_input :value, :css => 'full', :with_label => false do
     %code{ :class => 'html' }
       = f.text_area :value
     .more
-      = link_to t('admin.image_picker.link'), admin_theme_assets_path, :id => 'image-picker-link'    
\ No newline at end of file
+      = link_to t('admin.image_picker.link'), admin_theme_assets_path, :id => 'image-picker-link'
\ No newline at end of file
diff --git a/app/views/layouts/admin/login.html.haml b/app/views/layouts/admin/login.html.haml
index 0206ac3a..7302e9da 100644
--- a/app/views/layouts/admin/login.html.haml
+++ b/app/views/layouts/admin/login.html.haml
@@ -3,11 +3,11 @@
 %html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
   %head
     %title= escape_once("#{Locomotive.config.name} — #{current_site.name}")
-    
+
     = stylesheet_link_tag 'admin/blueprint/screen', 'admin/login', :media => 'screen', :cache => Rails.env.production? && !Locomotive.config.heroku
     / [if IE]
       = stylesheet_link_tag('admin/blueprint/ie', :media => 'screen')
-      
+
   %body
     #wrapper
       #light.container