Merge branch 'master' of

ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Conflicts:
	private/lib/gui/GUIHandler.php

public/admin/addMultimedia.php

@@ -34,7 +34,7 @@ try{
 				$saveable->mediaType = $mediaType;
 				if(strcmp($mediaType,MediaModel::TYPE_YOUTUBE)==0){
 					$matches = array();
-					var_dump(PostHandler::get("data"));
+// 					var_dump(PostHandler::get("data"));
 					if ( preg_match("~^https[:]//youtu\.be/(.+)$~", trim(PostHandler::get("data")), $matches) ){
 						$saveable->link = $matches[1];
 					}