Merge branch '2640-folder-api' into 1970-folder-view

diff --cc apps/workbench/config/routes.rb
index 2d025664dccba79f2e2b672ed1baf3cef6e7f892,f915671b530cd23b575ee74dcabbb034d331ae56..c64c31e914484a8444d07e15248e3c7792c8a8f9
--- 1/apps/workbench/config/routes.rb
--- 2/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@@ -40,9 -40,10 +40,11 @@@ ArvadosWorkbench::Application.routes.dr
    end
    resources :links
    match '/collections/graph' => 'collections#graph'
-   resources :collections
+   resources :collections do
+     post 'set_persistent', on: :member
+   end
    get '/collections/:uuid/*file' => 'collections#show_file', :format => false
 +  resources :folders
  
    post 'actions' => 'actions#post'