diff --git a/modifichePhpini b/modifichePhpini
new file mode 100644
index 0000000..3135642
--- /dev/null
+++ b/modifichePhpini
@@ -0,0 +1,2 @@
+post_max_size = 60M
+upload_max_filesize = 60M
\ No newline at end of file
diff --git a/private/common/config.local.php b/private/common/config.local.php
index 75406c5..58e1f71 100644
--- a/private/common/config.local.php
+++ b/private/common/config.local.php
@@ -29,7 +29,7 @@ $currentSystem->apache->user 		= "var-www";
 $currentSystem->apache->group 		= "var-www";
 $currentSystem->apache->workdir		= "/var/www"; // Il path in cui inserire la cartella con le pagine html
 
-$currentSystem->remoteLocationPath = "http://10.0.0.249/fdn2/";
+$currentSystem->remoteLocationPath = "http://localhost/fdn2/";
 
 $backupSystem = new stdClass();
 $backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267";
diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php
index 84b6944..de12ba2 100644
--- a/private/lib/gui/GUIHandler.php
+++ b/private/lib/gui/GUIHandler.php
@@ -248,7 +248,7 @@ class GUIHandler {
 	  			?>
 	  			<div style="display:inline-block;">
 					<div class="menuTab" id="menuable" >
-						<a href="javascript:void(0);">TUTTE LE SEZIONI <img style="margin-left:5px;vertical-align:middle;"src="images/menuArrow.png" alt""></a>
+						<a href="javascript:void(0);">TUTTE LE SEZIONI <img style="margin-left:5px;vertical-align:middle;"src="images/menuArrow.png" alt=""></a>
 					</div>
 					<div class="hiddenMenu" style="display:none;">
 						<ul class="categoryList">
diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php
index a20f1f1..6a98ffb 100644
--- a/private/lib/media/mediaRenderers/MediaLocalVideo.php
+++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php
@@ -10,11 +10,11 @@ class MediaLocalVideo extends MediaRenderer{
 	public function asText(array $opt = array()){
 		$size = MediaRendererInterface::SIZE_ORIGINAL;
 		if(array_key_exists("size", $opt) && array_key_exists($opt["size"], self::$SIZES)){
-			$size = $opt["size"];
+			$size = self::$SIZES[$opt["size"]];
 		}
 		
 		return '<video width="'.$size["width"].'" height="'.$size["height"].'" controls >'.
-					'<source src="'.$this->getPath().'" type="video/'.$this->extension.'" >'.
+					'<source src="'.$this->getVideoLink($size).'" type="video/'.$this->getExtension().'" >'.
 				'</video>';
 	}
 	
@@ -26,5 +26,18 @@ class MediaLocalVideo extends MediaRenderer{
 		$basepath = GlobalVariables::get("config")->paths->media;
 		return $basepath."/".$this->id.".".$this->extension;
 	}
+	
+	public function getExtension(){
+		$video = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$this->id));
+		return $video->extension;
+	}
+
+	public function getVideoLink($size){
+		if(!array_key_exists($size, self::$SIZES)){
+			$size = MediaRendererInterface::SIZE_ORIGINAL;
+		}
+		return GUIHandler::getBaseUrl().'getLocalVideo.php?id='.$this->id.'&size='.$size;
+	}
+	
 }
 ?>
\ No newline at end of file
diff --git a/public/admin/addMultimedia.php b/public/admin/addMultimedia.php
index 7ceaab1..aeae877 100644
--- a/public/admin/addMultimedia.php
+++ b/public/admin/addMultimedia.php
@@ -55,10 +55,10 @@ try{
 					$media = DaoMediaHandler::createNewTextBasedMedia($saveable);
 				}
 				else {
-					$file = $_FILES['data']['tmp_name'];
-					$info = pathinfo($_FILES['data']['name']);
-// 					$file = PostHandler::get("data");
-					$media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file,$info["extension"]);
+						$file = $_FILES['data']['tmp_name'];
+						$info = pathinfo($_FILES['data']['name']);
+						$media = DaoMediaHandler::createNewFileBasedMedia($saveable, $file,$info["extension"]);
+// 						var_dump($media);
 				}
 				
 				if(!is_null($media)){
@@ -67,7 +67,7 @@ try{
 					GlobalVariables::get("dao")->save($notizia);
 				}
 				else{
-					throw new Exception("Cannot save a null media in the news with id '".$notiziaId."'");
+					throw new Exception("Cannot save a null media '".$media."' in the news with id '".$notiziaId."'");
 				}
 			}
 			else{
@@ -78,7 +78,7 @@ try{
 		}
 	}
 	
-	$formFile = '<span class="label">Selezionare un file</span><input type="hidden" name="MAX_FILE_SIZE" value="52428800" />
+	$formFile = '<span class="label">Selezionare un file</span><input type="hidden" name="MAX_FILE_SIZE" value="62914560" />
 			<input type="file" name="data"/>';
 	
 	$formYoutube = '<span class="label">Link</span> <input type="text" name ="data"/>';
@@ -89,7 +89,7 @@ try{
 	$error = $ex->getMessage();
 }catch (Exception $exec){
 	LoggingFacilityManager::getLogger("gui")->log(LoggingFacility::$LEVEL_ERROR, $exec->getMessage());
-	$error = "Si è verificato un errore inaspettato durante l'esecuzione della pagina. Se l'errore persiste contattare il supporto tecnico.";
+	$error = "Si è verificato un errore inaspettato durante l'esecuzione della pagina. Se l'errore persiste contattare il supporto tecnico.".$exec->getMessage();
 }
 
 MenuGenerator::generateMenu();
@@ -97,6 +97,8 @@ HTMLHelper::generateAdminHead();
 ?>
 <div>
 	<?php echo $error;?>
+	<div class="errorShow" style="color:red;">
+	</div>
 	<div>
 		<form enctype="multipart/form-data" id="loadFile" method="POST">
 			<div style="margin:15px 5px;">
@@ -154,5 +156,18 @@ HTMLHelper::generateAdminHead();
 			$("form#loadFile").attr("action","homeMultimedia.php");
 			$("form#loadFile").submit();
 		});
+
+		$("input[name=data]").on("change",function(){
+			var fileSize = this.files[0].size/1024/1024;
+			if(fileSize > 60){
+				$("#submit").hide();
+				$(".errorShow").append("Dimesioni file non consentite. Max 60MB.")
+			}
+			else{
+				$("#submit").show();
+				$(".errorShow").html("");
+			}
+		});
+		
 	});
 </script>
\ No newline at end of file
diff --git a/public/admin/homeNotizie.php b/public/admin/homeNotizie.php
index effd9ef..f1b9b5a 100644
--- a/public/admin/homeNotizie.php
+++ b/public/admin/homeNotizie.php
@@ -53,7 +53,7 @@ try{
 				$ansa = $notizia->isAnsa;
 				
 				$delSondaggio = PostHandler::get("deleteSondaggio");
-				if(!is_null($delSondaggio) && strcmp($delSondaggio, "true")){
+				if(!is_null($delSondaggio) && strcmp($delSondaggio, "true")==0){
 					$notizia->sondaggio = null;
 					GlobalVariables::get("dao")->save($notizia);
 				}
@@ -82,6 +82,7 @@ try{
 		}
 	}
 
+// 	var_dump($notizia);
 	MenuGenerator::generateMenu();
 	HTMLHelper::generateAdminHead();
 
@@ -174,16 +175,25 @@ try{
 				<?php if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_COMMENTI_SUPERVISOR)){ ?>
 					<li><a href="#" id="notiziaMenu_commenti">Visualizza Commenti</a></li>
 				<?php }?>
-				<?php if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_SONDAGGI)){ ?>
-					<?php if(sizeof($notizia->sondaggio->votanti)==0){
-							  if($notizia->hasProperty("sondaggio") && !is_null($notizia->sondaggio)){?>
-								<li><a href="#" id="notiziaMenu_addSondaggi">Modifica Sondaggio</a></li>
-								<li><a href="#" id="notiziaMenu_deleteSondaggi">Cancella Sondaggio</a></li>
-						<?php }else{?>
-								<li><a href="#" id="notiziaMenu_addSondaggi">Crea Sondaggio</a></li>
-					<?php 	  }
-						   } ?>
-				<?php }?>
+				<?php 
+				if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_SONDAGGI)){ 
+					if($notizia->hasProperty("sondaggio") && !is_null($notizia->sondaggio)){
+						if(sizeof($notizia->sondaggio->votanti)==0){
+							?>
+							<li><a href="#" id="notiziaMenu_addSondaggi">Modifica Sondaggio</a></li>
+							<?php 
+						}
+						?>
+						<li><a href="#" id="notiziaMenu_deleteSondaggi">Cancella Sondaggio</a></li>
+						<?php 						   
+					}
+					else{
+						?>							
+						<li><a href="#" id="notiziaMenu_addSondaggi">Crea Sondaggio</a></li>
+						<?php  
+					} 
+				}
+				?>
 				<li><a href="listNotizie.php" id="notiziaMenu_back">Torna alla lista notizie</a></li>
 			</ul>
 		</div>
@@ -218,7 +228,7 @@ try{
 		});
 
 		$("#notiziaMenu_deleteSondaggi").click(function(event){
-			$("form#notiziaForm").attr("action","homeSondaggi.php");
+			$("form#notiziaForm").attr("action","homeNotizie.php");
 			
 			$("form#notiziaForm input[type=hidden][name=deleteSondaggio]").val("true");
 			$("form#notiziaForm").submit();
diff --git a/public/admin/index.php b/public/admin/index.php
index da8d92c..95b86ca 100644
--- a/public/admin/index.php
+++ b/public/admin/index.php
@@ -108,6 +108,12 @@ HTMLHelper::generateAdminHead();
 		Le newsletter nella lista <i>Inviate</i> sono invece gi&agrave; lavorate o in fase di lavorazione e sono quindi solo visibili ma non modificabili.
 	</p>
 	<?php } ?>
+	<h3>Contenuti Multimediali</h3>
+	<p style="text-align:justify;">
+		Caricare contenuti multimediali in proporzione 16:9.
+		La dimensione minima deve essere 500x375.
+		Non possono essere caricati file più grandi di <b>60MB</b>.
+	</p>
 	<?php if (AdminLoginManager::getLogged()->hasRole(AdminModel::ADMIN_TYPE_NEWSLETTER)){ ?>
 	<h3>Statistiche</h3>
 	<p style="text-align:justify;">
diff --git a/public/articolo.php b/public/articolo.php
index b067ada..9822ebe 100644
--- a/public/articolo.php
+++ b/public/articolo.php
@@ -142,11 +142,16 @@ GUIHandler::generateHtmlHeaders(array("additionalMetadata"=>$additionalHeaders,"
 						if(sizeof($medias)>0){
 							$pos = array_search($media, $medias);
 						}
+						if($media->mediaType == MediaModel::TYPE_IMAGE){
 			?>
-				<div onclick="javascript:loadImage('<?php echo $pos;?>')">
-					<?php $media->renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true));?>
-				</div>
-			<?php 
+							<div onclick="javascript:loadImage('<?php echo $pos;?>')">
+								<?php $media->renderMedia(array("size"=>MediaRenderer::SIZE_BIG,"clickable"=>true));?>
+							</div>
+							
+			<?php 		}
+						else {
+							$media->renderMedia(array("size"=>MediaRenderer::SIZE_ORIGINAL,"clickable"=>false));
+						}
 					}
 			?>
 			</div>
diff --git a/public/getLocalVideo.php b/public/getLocalVideo.php
new file mode 100644
index 0000000..a1f0e9e
--- /dev/null
+++ b/public/getLocalVideo.php
@@ -0,0 +1,23 @@
+<?php
+
+require_once(dirname(__FILE__)."/load.php");
+
+// $sizes = array(
+// 		"large"=>array("width"=>800,"height"=>600),
+// 		"small"=>array("width"=>160,"height"=>120)
+// );
+
+if (array_key_exists("id",$_GET)) {
+	$video = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$_GET['id']));
+
+	if (!is_null($video)){
+		$basepath = GlobalVariables::get("config")->paths->media;
+		$videoPath= $basepath."/".$video->id.".".$video->extension;
+		$lenght = filesize($videoPath);
+		
+		header('Content-type: '.mime_content_type($videoPath));
+		header('Content-Lenght: '.$lenght);
+		readfile($videoPath);
+	}
+}
+?>
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index d756838..c5cacd7 100644
--- a/public/index.php
+++ b/public/index.php
@@ -343,7 +343,7 @@ catch (Exception $ex){
 		<div class="middleRightBanner mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
 		<div class="lastNews">
 			<div class="categoryBar" style="text-align:left;">
-				<div class="categoryTag"><span>Pi&ugrave Letti</span></div>
+				<div class="categoryTag"><span>Pi&ugrave; Letti</span></div>
 				<div class="categoryLine"></div>
 			</div>
 			<?php if(sizeof($lastsNews)>0){
diff --git a/public/mobile/style/public.css b/public/mobile/style/public.css
index ac50056..467e8a1 100644
--- a/public/mobile/style/public.css
+++ b/public/mobile/style/public.css
@@ -115,6 +115,7 @@ body{font-family:lato, arial;}
 .headArticolo, .primaryNews{margin-bottom:10px;}
 .primaryNews .newsImage{width:100vw;max-height:40vh;text-align:center;overflow:hidden;}
 .headArticolo .newsImage, .primaryNews .newsImage img{width:100vw;}
+.headArticolo .newsImage video,.primaryNews .newsImage video{max-width:90vw;margin:2em 0;}
 .headArticolo .newsImage, .primaryNews .newsImage iframe{max-width:100vw;}
 .primaryNews .newsTitle{padding:10px 15px;font-weight:bold;text-align:left;text-decoration:none;color:black;font-size:14pt;}