Merging latest 3.1 changes into trunk

5 files changed, 3 insertions, 3 deletions

diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page
index 89d64110..a826f5a8 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page
@@ -38,7 +38,7 @@
 }
 
 .trash-hover {
-	background-image: url(<%~ assets/trash.png%>);
+	background-image: url(<%~ images/trash.png%>);
 }
 
 </style>
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
index 276ee6a4..0e4f6193 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
@@ -20,12 +20,12 @@ class Home extends TPage
 		return array (
 			array (
 				'ProductId' => 'Product1',
-				'ProductImageUrl' => $this->publishAsset('assets/product1.png'),
+				'ProductImageUrl' => $this->publishAsset('images/product1.png'),
 				'ProductTitle' => 'Cup'
 			),
 			array (
 				'ProductId' => 'Product2',
-				'ProductImageUrl' => $this->publishAsset('assets/product2.png'),
+				'ProductImageUrl' => $this->publishAsset('images/product2.png'),
 				'ProductTitle' => 'T-Shirt'
 			)
 		);
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png
index ae03d551..ae03d551 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png
index 25e81ad7..25e81ad7 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png
index 184f7628..184f7628 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png