2760: Merge branch 'master' into 2760-folder-hierarchy

diff --cc apps/workbench/app/controllers/application_controller.rb
index 2b71eeaae9f309c4ba16cdaf4a9227daa1943ff7,ade586c47422b88d848612a9adf4a19330eae1bd..59ca3503c879edaddcd40579ae2004894250e260
--- 1/apps/workbench/app/controllers/application_controller.rb
--- 2/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@@ -12,8 -11,8 +11,7 @@@ class ApplicationController < ActionCon
    around_filter :thread_with_optional_api_token
    before_filter :check_user_agreements, except: ERROR_ACTIONS
    before_filter :check_user_notifications, except: ERROR_ACTIONS
-   around_filter :using_reader_tokens, only: [:index, :show]
    before_filter :find_object_by_uuid, except: [:index] + ERROR_ACTIONS
 -  before_filter :check_my_folders, :except => ERROR_ACTIONS
    theme :select_theme
  
    begin

diff --cc apps/workbench/app/views/layouts/application.html.erb
Simple merge

diff --cc apps/workbench/config/routes.rb
Simple merge