Merge remote-tracking branch 'origin/gherkins-cws-2' into gherkins-cws-2

Author: Peter Cenov

integration_testing/features/manage-resources/bulk-editing/bul-edit-multiple-resources.feature

@@ -52,7 +52,7 @@ Feature: Bulk edit multiple resources
 			And I see the *Audience* section with the *Language* and *Visible to* drop-downs
 			And I see the *Source* section with *Author*, *Provider*, *Aggregator*, *License* and *Copyright* holder fields
 		When I make any modifications
-			And I click the *Finish* button 
+			And I click the *Finish* button
 		Then I am back at the channel editor
 		When I select again the same resources
 			And I click the *Edit details* icon
@@ -69,7 +69,7 @@ Feature: Bulk edit multiple resources
 			And I see the *Audience* section with the *Language* and *Visible to* drop-downs
 			And I see the *Source* section with *Author*, *Provider*, *Aggregator*, *License* and *Copyright* holder fields
 		When I make any modifications
-			And I click the *Finish* button 
+			And I click the *Finish* button
 		Then I am back at the channel editor
 		When I select again the same resources
 			And I click the *Edit details* icon
@@ -85,7 +85,7 @@ Feature: Bulk edit multiple resources
 			And I see the *Basic information* section containing the *Tags* field
 			And I see the *Audience* section with the *Language* drop-down
 		When I make any modifications
-			And I click the *Finish* button 
+			And I click the *Finish* button
 		Then I am back at the channel editor
 		When I select again the same resources
 			And I click the *Edit details* icon

integration_testing/features/manage-resources/copy-resources/manage-clipboard.feature

@@ -31,15 +31,15 @@ Feature: Manage the clipboard
 		Given I am viewing the clipboard
 		When I right click a folder or a resource
 			And click the *Move to...* option from the menu
-		Then I see the *Move N folder(s), N resources into: <channel>* modal 
+		Then I see the *Move N folder(s), N resources into: <channel>* modal
 			And I can choose a new directory or channel to move the items to
 
 	Scenario: Move multiple resources
 		Given I am viewing the clipboard
 		When I select multiple items
 		Then I see that the select bar changes to an actions bar
 		When I click the *Move* button in the actions bar
-		Then I see the *Move N folder(s), N resources into: <channel>* modal 
+		Then I see the *Move N folder(s), N resources into: <channel>* modal
 			And I can choose a new directory or channel to move the items to
 
 	Scenario: Delete a resource from the clipboard via right click