diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7fb3737c..bfc4469d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,10 +27,10 @@ private
   end
 
   def layout_by_resource
-    if devise_controller?
-      return 'obtain_token' if session[:user_return_to].present?
-      return 'theme1' if session[:supplier_return_to].present?
-    end
+    #if devise_controller?
+      #return 'obtain_token' if session[:user_return_to].present? # resource_name == :user ????
+      #return 'theme1' if session[:supplier_return_to].present?
+    #end
     "theme1"
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f841eb4d..0bea4370 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -158,4 +158,9 @@ module ApplicationHelper
     I18n.locale == I18n.default_locale ? '/' : "/#{I18n.locale}"
   end
 
+  def link_to_function(title, function, options={})
+    options[:onclick] = function
+    link_to title, 'javascript:void(0)', options
+  end
+
 end
diff --git a/config/deploy.rb b/config/deploy.rb
index e6339af2..9e871013 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -45,7 +45,12 @@ namespace :deploy do
   task :restart do
     on roles(:app), in: :sequence, wait: 5 do
       # Your restart mechanism here, for example:
+       within release_path do
+         #execute :rake, 'cache:clear', as: 'www-data'
+         execute :rake, 'dedigest_assets', as: 'www-data'
+       end
        execute :chown, "-R www-data:www-data", release_path
+       execute :chown, "-R www-data:www-data", release_path.join('public/assets/')
        execute :touch, release_path.join('tmp/restart.txt')
     end
   end
@@ -55,10 +60,9 @@ namespace :deploy do
   after :restart, :clear_cache do
     on roles(:web), in: :groups, limit: 3, wait: 10 do
       # Here we can do anything such as:
-       within release_path do
-         #execute :rake, 'cache:clear', as: 'www-data'
-         execute :rake, 'dedigest_assets', as: 'www-data'
-       end
+       #within release_path do
+         ##execute :rake, 'cache:clear', as: 'www-data'
+       #end
     end
   end
 
diff --git a/lib/capistrano/tasks/dedigest_assets.rake b/lib/tasks/dedigest_assets.rake
similarity index 100%
rename from lib/capistrano/tasks/dedigest_assets.rake
rename to lib/tasks/dedigest_assets.rake