Merge branch 'master' into 4025-move-project-button-label

Conflicts:
	apps/workbench/app/views/application/_title_and_buttons.html.erb

diff --cc apps/workbench/app/views/application/_title_and_buttons.html.erb
index c2bd726775ccdfcfd085168580553bced1d5af58,713c04e7f28802e8cde349ae9b48c67c64cc4248..822c9048579487366ef2591a7a055454b7dd586e
--- 1/apps/workbench/app/views/application/_title_and_buttons.html.erb
--- 2/apps/workbench/app/views/application/_title_and_buttons.html.erb
+++ b/apps/workbench/app/views/application/_title_and_buttons.html.erb
@@@ -26,7 -25,7 +26,8 @@@
               selection_param: 'uuid',
               success: 'redirect-to-created-object'
             }.to_json),
-           { class: "btn btn-sm btn-primary", remote: true, method: 'get', title: "Copy this #{object_class} to a different project" }) do %>
 -          { class: "btn btn-sm btn-primary", remote: true, method: 'get' }) do %>
++          { class: "btn btn-sm btn-primary", remote: true, method: 'get',
++            title: "Make a copy this #{object_class}" }) do %>
          <i class="fa fa-fw fa-copy"></i> Copy to project...
        <% end %>
      <% end %>
@@@ -43,8 -42,8 +44,9 @@@
               selection_param: 'uuid',
               success: 'redirect-to-created-object'
             }.to_json),
-           { class: "btn btn-sm btn-primary", remote: true, method: 'get', title: "Move this #{object_class} to a different project"}) do %>
-         <i class="fa fa-fw fa-truck"></i> Move...
 -          { class: "btn btn-sm btn-primary", remote: true, method: 'get' }) do %>
 -        <i class="fa fa-fw fa-truck"></i> Move to project...
++          { class: "btn btn-sm btn-primary", remote: true, method: 'get',
++            title: "Move this #{object_class} to a different project"}) do %>
++        <i class="fa fa-fw fa-truck"></i> Move <%=object_class%>...
        <% end %>
      <% end %>
    <% end %>

diff --cc apps/workbench/test/integration/projects_test.rb
Simple merge