diff --git a/config/layouts/default.json b/config/layouts/default.json
index 8ee06509a9b542c1a627954ed2f75637ccaf30d4..34b5e2c5dd4505e2b8e4805c608d1673aeb3fbe2 100755
--- a/config/layouts/default.json
+++ b/config/layouts/default.json
@@ -1,31 +1,45 @@
 {
-  "type": "xsplit",
-  "cut": 35,
-  "left": {
-    "type": "panel",
-    "name": "departure",
-    "config": "oh14"
-  },
-  "right": {
-    "type": "ysplit",
-    "cut": 30,
-    "up": {
-      "type": "panel",
-      "name": "clock"
-    },
-    "down": {
-      "type": "cycler",
-      "duration": 5,
-      "panels": [
-        {
-          "type": "panel",
-          "name": "ufc"
-        },
-        {
-          "type": "panel",
-          "name": "mensaPlan"
-        }
-      ]
-    }
-  }
-}
+	"type": "xsplit",
+	"cut": 35,
+	"left": {
+		"type": "panel",
+		"name": "departure",
+		"config": "oh14"
+	},
+	"right": {
+		"type": "ysplit",
+		"cut": 30,
+		"up": {
+			"type": "panel",
+			"name": "clock"
+		},
+		"down": {
+			"type": "cycler",
+			"duration": 5,
+			"panels": [
+				{
+					"type": "panel",
+					"name": "werbung",
+					"config": {
+						"files": [
+							{ 
+							"filename": "Grillen2016_0.png"
+							},
+							{
+							"filename": "itour2016_0.png"
+							}
+						]
+					}
+				},
+				{
+					"type": "panel",
+					"name": "ufc"
+				},
+				{
+					"type": "panel",
+					"name": "mensaPlan"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/config/layouts/sitzung.json b/config/layouts/sitzung.json
deleted file mode 100644
index 3c3f8224924b7aad9a0e8346963802a45582037d..0000000000000000000000000000000000000000
--- a/config/layouts/sitzung.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "type":"xsplit",
-  "cut":35,
-  "left":
-  {
-    "type":"panel",
-    "name":"topListe"
-  },
-  "right":
-  {
-    "type" : "ysplit",
-    "cut" : 30,
-    "up" :
-    {
-      "type":"panel","name":"clock"
-    },
-    "down":
-    {
-      "type":"panel","name":"mensaPlan"
-    }
-  }
-}
diff --git a/config/panel/scrollbar/oh14.json b/config/panel/scrollbar/oh14.json
index 24210bda1684b8c928098bce02ad7c4aea663992..689ba6e9121628ee0ff54edefb5eac9b8614cf68 100755
--- a/config/panel/scrollbar/oh14.json
+++ b/config/panel/scrollbar/oh14.json
@@ -1,12 +1,8 @@
 {
 	"texts": [
-		[
-			"BETA-V01 - 01.07.2015"
-		],
 		[
 			"Ihr wollt etwas beitragen?",
-			"https://bitbucket.org/FsInformatikDortmund",
-			"ib.2deep4real.de"
+			"https://bitbucket.org/FsInformatikDortmund"
 		],
 		[
 			"Euch gefällt das Design nicht?",
diff --git a/panels/lsfView/.gitignore b/panels/lsfView/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4f4773fb3403f3ec4097ab7c7b1fdec23b9aa924
--- /dev/null
+++ b/panels/lsfView/.gitignore
@@ -0,0 +1 @@
+config.php
diff --git a/panels/lsfView/config.php.skel b/panels/lsfView/config.php.skel
new file mode 100755
index 0000000000000000000000000000000000000000..938f878b1800e61c7c3a2d28a54e7b930e052167
--- /dev/null
+++ b/panels/lsfView/config.php.skel
@@ -0,0 +1,31 @@
+<?php
+// Universal
+$SEARCH_URL = "https://www.lsf.tu-dortmund.de/qisserver/rds?state=wsearchv&search=1";
+$SUBJECT_LIST_SS = array (
+	new SUBJECT("Datenstrukturen, Algorithmen und Programmierung 1","Datenstrukturen, Algorithmen und Programmierung 1","DAP 1"),
+	new SUBJECT("Mathematik für Informatik II","Mathematik für Informatik II","MafI 2"),
+	new SUBJECT("Datenstrukturen, Algorithmen und Programmierung 2","Datenstrukturen, Algorithmen und Programmierung 2","DAP 2"),
+	new SUBJECT("Betriebssysteme","Betriebssysteme","BS"),
+	new SUBJECT("Elektrotechnik und Nachrichtentechnik","Elektrotechnik und Nachrichtentechnik","EtNt"),
+	new SUBJECT("Softwaretechnik","Softwaretechnik","Swt"),
+	new SUBJECT("Informationssysteme","Informationssysteme","IS"),
+	new SUBJECT("Grundbegriffe der Theoretischen Informatik","Grundbegriffe der Theoretischen Informatik","GTI"),
+	new SUBJECT("Höhere Mathematik II (ET/IT)","Höhere Mathematik II","HöMa 2")
+);
+$SUBJECT_LIST_WS = array (
+	new SUBJECT("Datenstrukturen, Algorithmen und Programmierung 1","Datenstrukturen, Algorithmen und Programmierung 1","DAP 1"),
+	new SUBJECT("Rechnerstrukturen","Rechnerstrukturen","RS"),
+	new SUBJECT("Mathematik für Informatik I","Mathematik für Informatik I","MafI 1"),
+	new SUBJECT("Logik","Logik","Logik"),
+	new SUBJECT("Funktionale Programmierung","Funktionale Programmierung","FuPro"),
+	new SUBJECT("Rechnernetze und verteilte Systeme (ehemals BSRvS 2)","Rechnernetze und verteilte Systeme","RvS"),
+	new SUBJECT("Wahrscheinlichkeitsrechnung und Mathematische Statistik für Informatiker","Wahrscheinlichkeitsrechnung und Mathematische Statistik","WruMS"),
+	new SUBJECT("Höhere Mathematik I (ET/IT/I-I)","Höhere Mathematik I","HöMa 1"),
+	new SUBJECT("Höhere Mathematik III (P/ET/ITMP/I-I)","Höhere Mathematik III","HöMa 3")
+);
+
+// JSON
+$JSON_NAME = "../../tmp/lsfView.json";
+$JSON_INC_NAME = true;
+$JSON_INC_SHORT = true;
+?>
\ No newline at end of file
diff --git a/panels/lsfView/event.php b/panels/lsfView/event.php
new file mode 100755
index 0000000000000000000000000000000000000000..8af1f855cd179335dd7a0b676af4e1febbdc575c
--- /dev/null
+++ b/panels/lsfView/event.php
@@ -0,0 +1,52 @@
+<?php
+class EVENT {
+	private $day = "";
+	private $startTime = 0;
+	private $endTime = 0;
+	private $room = "";
+	function __construct($day,$startTime,$endTime,$room) {
+		$this->day = $day;
+		$this->startTime = $startTime;
+		$this->endTime = $endTime;
+		$this->room = $room;
+	}
+	public function getDay() {
+		return $this->day;
+	}
+	public function getStartTime() {
+		return $this->startTime;
+	}
+	public function getEndTime() {
+		return $this->endTime;
+	}
+	public function getRoom() {
+		return $this->room;
+	}
+	public function setDay($day) {
+		$this->day = $day;
+	}
+	public function setStartTime($startTime) {
+		$this->startTime = $startTime;
+	}
+	public function setEndTime($endTime) {
+		$this->endTime = $endTime;
+	}
+	public function setRoom($room) {
+		$this->room = $room;
+	}
+	
+	public function toJson() {
+		$json = '{';
+		$json .= '"Day": '.$this->day;
+		$json .= ',"StartTime": "'.$this->startTime . '"';
+		$json .= ',"EndTime": "'.$this->endTime . '"';
+		$json .= ',"Room": "'.$this->room . '"';
+		$json .= '}';
+		return $json;
+	}
+	
+	public function __toString() {
+		return "Day: " . $this->day . ", StartTime: " . $this->startTime . ", EndTime: ". $this->endTime . ", Room: ".$this->room;
+	}
+}
+?>
\ No newline at end of file
diff --git a/panels/lsfView/helper.php b/panels/lsfView/helper.php
new file mode 100755
index 0000000000000000000000000000000000000000..d7dfa6e4fd8a60dd80482eff97eb5babe30a3af8
--- /dev/null
+++ b/panels/lsfView/helper.php
@@ -0,0 +1,92 @@
+<?php
+function booleanToString($bool) {
+	if ($bool) {
+		return "True";
+	} else {
+		return "False";
+	}
+}
+
+//TODO:
+function toJson($subjects, $jsonName, $inc_name = true, $inc_short = true) {
+	$kommata = false;
+	$json = '{';
+	foreach ( $subjects as $subject ) {
+		if ($kommata) {
+			$json .= ',';
+		} else {
+			$kommata = true;
+		}
+		$json .= $subject->toJson ( $inc_name, $inc_short);
+	}
+	$json .= "}";
+	file_put_contents ( $jsonName , $json );
+}
+
+function parsSubject($html,$subject) {
+	echo "Parsing " . $subject->getSearchName() . "\n";
+	//$subject->setNr($html->find('td',2)->innertext);
+	//$subject->setShort($html->find('td',3)->innertext);
+	$html = $html->find('table[summary="Übersicht über alle Veranstaltungstermine"]',0);
+	$html = $html->find('tr');
+	array_shift($html);
+	if(count($html)!=0){
+		echo " - Events: " . count($html) . "\n";
+		foreach($html as $event) {
+			$subject->addEvent(new EVENT(fixDay($event->children()[1]->innertext),fixTimeStart($event->children()[2]->innertext),fixTimeEnd($event->children()[2]->innertext),$event->children()[5]->first_child()->innertext));
+		}
+	}
+	return $subject;
+}
+
+function fixDay($day){
+	$day = str_replace('	',"",$day);
+	$day = str_replace(' ',"",$day);
+	switch($day){
+		case "Mo.":
+			$day = 0;
+			break;
+		case "Di.":
+			$day = 1;
+			break;
+		case "Mi.":
+			$day = 2;
+			break;
+		case "Do.":
+			$day = 3;
+			break;
+		case "Fr.":
+			$day = 4;
+			break;
+		case "Sa.":
+			$day = 5;
+			break;
+		case "So.":
+			$day = 6;
+			break;
+		default:
+			$day = -1;
+	}
+	return $day;
+}
+
+function fixTimeStart($time){
+	$time= removeSpace($time);
+	$time = html_entity_decode($time);
+	$time = substr ( $time , 0 , 5 );
+	return $time;
+}
+
+function fixTimeEnd($time){
+	$time= removeSpace($time);
+	$time = html_entity_decode($time);
+	$time = substr ( $time , 12 , 15);
+	return $time;
+}
+
+function removeSpace($text){
+	$text = str_replace('	',"",$text);
+	$text = str_replace(' ',"",$text);
+	return $text;
+}
+?>
\ No newline at end of file
diff --git a/panels/lsfView/lsfParser.php b/panels/lsfView/lsfParser.php
new file mode 100755
index 0000000000000000000000000000000000000000..3379dcd231a4d4789518abd0f62f1a8b8bea33bc
--- /dev/null
+++ b/panels/lsfView/lsfParser.php
@@ -0,0 +1,93 @@
+<?php
+ini_set('display_errors', 'On');
+error_reporting(E_ALL);
+
+require 'simple_html_dom.php';
+require 'subject.php';
+require 'event.php';
+require 'helper.php';
+require 'config.php';
+
+// check semester
+switch (date("n")) {
+    case 1:
+        $SEMESTER = "2";
+        break;
+    case 2:
+		$SEMESTER = "2";
+        break;
+	case 3:
+        $SEMESTER = "2";
+        break;
+	case 4:
+        $SEMESTER = "1";
+        break;
+	case 5:
+        $SEMESTER = "1";
+        break;
+	case 6:
+        $SEMESTER = "1";
+        break;
+	case 7:
+        $SEMESTER = "1";
+        break;
+	case 8:
+        $SEMESTER = "1";
+        break;
+	case 9:
+        $SEMESTER = "1";
+        break;
+	case 10:
+        $SEMESTER = "2";
+        break;
+	case 11:
+        $SEMESTER = "2";
+        break;
+	case 12:
+        $SEMESTER = "2";
+        break;
+}
+
+// choose correct subject_list
+if($SEMESTER == 1){
+	$SUBJECT_LIST = $SUBJECT_LIST_SS;
+	echo "SS\n";
+} else {
+	$SUBJECT_LIST = $SUBJECT_LIST_WS;
+	echo "WS\n";
+}
+
+// search subject
+$subjects = array ();
+foreach ( $SUBJECT_LIST as $SUBJECT ) {
+	echo "Searching ".$SUBJECT->getSearchName()."-";
+	$html = file_get_html ( $SEARCH_URL."&veranstaltung.dtxt=".str_replace(' ',"+",$SUBJECT->getSearchName())."&veranstaltung.semester=".date("Y").$SEMESTER);
+	if ($html != null) {
+		$list = $html->find('a[title="Mehr Informationen zu '.$SUBJECT->getSearchName().'"]');
+		if (count($list) != 0) {
+			foreach($list as $a){
+				if(removeSpace($a->parent()->parent()->children (2)->innertext) == "Vorlesung") {
+					echo "Hit-";
+					$HREF = $a->href;
+					$html->clear();
+					unset($html);
+					$html = file_get_html ( html_entity_decode($HREF) );
+					if ($html != null) {
+					array_push ( $subjects, parsSubject ($html,$SUBJECT) );
+					} else {
+						echo "\"".$SUBJECT->getSearchName()."\"-Site nicht aufrufbar\n";
+					}
+					break;
+				}
+			}
+	} else {
+		echo "\"".$SUBJECT->getSearchName()."\"-Search liefert kein passendes Ergebnis\n";
+	}
+	} else {
+		echo "\"".$SUBJECT->getSearchName()."\"-Search nicht aufrufbar.\n";
+	}
+}
+
+toJson ( $subjects, $JSON_NAME, $JSON_INC_NAME, $JSON_INC_SHORT);
+
+?>
\ No newline at end of file
diff --git a/panels/lsfView/script.js b/panels/lsfView/script.js
new file mode 100755
index 0000000000000000000000000000000000000000..2ca7c5acb40befb08b48d9a7d9039961a28e3985
--- /dev/null
+++ b/panels/lsfView/script.js
@@ -0,0 +1,221 @@
+this.tabtime=20;
+this.checkShowCondition = function() {
+	return 3*this.tabtime;
+}
+this.show = function() {
+	// switch tabs
+	this.interval=setInterval(function() {
+		var currentTab = $("#tabs").tabs('option', 'active');
+		switch (currentTab) {
+		case 0:
+			currentTab = 1;
+			break;
+		case 1:
+			currentTab = 2;
+			break;
+		case 2:
+			currentTab = 0;
+			break;
+		default:
+			currentTab = 0;
+		}
+		$("#tabs").tabs({
+			active : currentTab
+		});
+	}, this.tabtime*1000);
+
+}
+this.hide = function() {
+	clearInterval(this.interval);
+}
+
+this.loaded = function(panel, config) {
+	// reload data
+	setInterval(function() {
+		getMensaPlan();
+	}, 30*60*1000);
+
+	function getMensaPlan() {
+		$.getJSON("tmp/mensaPlan.json?"+( new Date().getTime()) ).done(function(json) {
+			fillTable(json);
+		}).fail(function(jqxhr, textStatus, error) {
+			var err = textStatus + ", " + error;
+			console.log("Request Failed: " + err);
+		});
+	}
+
+	function fillTable(json) {
+		var date = new Date();
+		var next = 0;
+		if (date.getHours() >= 15) {
+			next = 1;
+		}
+		switch (date.getDay() + next) {
+		case 0:
+			var day = json.montag;
+			break;
+		case 1:
+			var day = json.montag;
+			break;
+		case 2:
+			var day = json.dienstag;
+			break;
+		case 3:
+			var day = json.mittwoch;
+			break;
+		case 4:
+			var day = json.donnerstag;
+			break;
+		case 5:
+			var day = json.freitag;
+			break;
+		case 6:
+			var day = json.montag;
+			break;
+		case 7:
+			var day = json.montag;
+			break;
+		}
+		if (next) {
+			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von MORGEN dem  "
+					+ day[0].date;
+		} else {
+			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von HEUTE dem  "
+					+ day[0].date;
+		}
+		var tableBody1 = document.getElementById("mensaPlanTable1Body");
+		var tableBody2 = document.getElementById("mensaPlanTable2Body");
+		var tableBody3 = document.getElementById("mensaPlanTable3Body");
+		tableBody1.innerHTML = ""; // clear
+		tableBody2.innerHTML = ""; // clear
+		tableBody3.innerHTML = ""; // clear
+		var a = 0;
+		var b = 0;
+		var c = 0;
+		for (var i = 0; i < day.length; i++) {
+			var gericht = day[i];
+			var row = "";
+			switch (gericht.counter) {
+			case 1:
+				var row = tableBody1.insertRow(a);
+				a++;
+				break;
+			case 2:
+				var row = tableBody1.insertRow(a);
+				a++;
+				break;
+			case 3:
+				var row = tableBody1.insertRow(a);
+				a++;
+				break;
+			case 4:
+				var row = tableBody3.insertRow(c);
+				c++;
+				break;
+			case 5:
+				var row = tableBody1.insertRow(a);
+				a++;
+				break;
+			case 6:
+				var row = tableBody2.insertRow(b);
+				b++;
+				break;
+			case 7:
+				var row = tableBody3.insertRow(c);
+				c++;
+				break;
+			case 8:
+				var row = tableBody3.insertRow(c);
+				c++;
+				break;
+			default:
+				var row = tableBody3.insertRow(c);
+				c++;
+			}
+			var cell1 = row.insertCell(0);
+			var cell2 = row.insertCell(1);
+			var cell3 = row.insertCell(2);
+			cell1.innerHTML = gericht.shortText;
+			var art = "";
+			var first = true;
+			if (gericht.rind) {
+				art += "R";
+			}
+			if (!first) {
+				art += " ";
+				first = false;
+			}
+			if (gericht.schwein) {
+				art += "S";
+			}
+			if (!first) {
+				art += " ";
+				first = false;
+			}
+			if (gericht.gefluegel) {
+				art += "G";
+			}
+			if (!first) {
+				art += " ";
+				first = false;
+			}
+			if (gericht.fisch) {
+				art += "F";
+			}
+			if (!first) {
+				art += " ";
+				first = false;
+			}
+			if (gericht.vegetarisch) {
+				art += "V";
+			}
+			if (!first) {
+				art += " ";
+				first = false;
+			}
+			if (gericht.vegan) {
+				art += "N";
+			}
+			cell2.innerHTML = art;
+			var img = "";
+			switch (gericht.counter) {
+			case 1:
+				img = "icon-menue-1.png";
+				break;
+			case 2:
+				img = "icon-menue-2.png";
+				break;
+			case 3:
+				img = "icon-tagesgericht.png";
+				break;
+			case 4:
+				img = "icon-vegetarisch.png";
+				break;
+			case 5:
+				img = "icon-aktionsteller.png";
+				break;
+			case 6:
+				img = "icon-grillstation.png";
+				break;
+			case 7:
+				img = "icon-fisch.png";
+				break;
+			case 8:
+				img = "icon-vegan.png";
+				break;
+			default:
+				img = "ERROR";
+			}
+			if (gericht.counter != 0) {
+				gericht.counter = cell3.innerHTML = '<img src="panels/mensaPlan/img/'
+						+ img + '" />';
+			}
+		}
+	}
+
+	getMensaPlan();
+
+	$(function() {
+		$("#tabs").tabs();
+	});
+}
diff --git a/panels/lsfView/simple_html_dom.php b/panels/lsfView/simple_html_dom.php
new file mode 100755
index 0000000000000000000000000000000000000000..93884dd8a395203cc6f2e20349b9127bd264de52
--- /dev/null
+++ b/panels/lsfView/simple_html_dom.php
@@ -0,0 +1,1742 @@
+<?php
+/**
+ * Website: http://sourceforge.net/projects/simplehtmldom/
+ * Additional projects that may be used: http://sourceforge.net/projects/debugobject/
+ * Acknowledge: Jose Solorzano (https://sourceforge.net/projects/php-html/)
+ * Contributions by:
+ *	 Yousuke Kumakura (Attribute filters)
+ *	 Vadim Voituk (Negative indexes supports of "find" method)
+ *	 Antcs (Constructor with automatically load contents either text or file/url)
+ *
+ * all affected sections have comments starting with "PaperG"
+ *
+ * Paperg - Added case insensitive testing of the value of the selector.
+ * Paperg - Added tag_start for the starting index of tags - NOTE: This works but not accurately.
+ *  This tag_start gets counted AFTER \r\n have been crushed out, and after the remove_noice calls so it will not reflect the REAL position of the tag in the source,
+ *  it will almost always be smaller by some amount.
+ *  We use this to determine how far into the file the tag in question is.  This "percentage will never be accurate as the $dom->size is the "real" number of bytes the dom was created from.
+ *  but for most purposes, it's a really good estimation.
+ * Paperg - Added the forceTagsClosed to the dom constructor.  Forcing tags closed is great for malformed html, but it CAN lead to parsing errors.
+ * Allow the user to tell us how much they trust the html.
+ * Paperg add the text and plaintext to the selectors for the find syntax.  plaintext implies text in the innertext of a node.  text implies that the tag is a text node.
+ * This allows for us to find tags based on the text they contain.
+ * Create find_ancestor_tag to see if a tag is - at any level - inside of another specific tag.
+ * Paperg: added parse_charset so that we know about the character set of the source document.
+ *  NOTE:  If the user's system has a routine called get_last_retrieve_url_contents_content_type availalbe, we will assume it's returning the content-type header from the
+ *  last transfer or curl_exec, and we will parse that and use it in preference to any other method of charset detection.
+ *
+ * Found infinite loop in the case of broken html in restore_noise.  Rewrote to protect from that.
+ * PaperG (John Schlick) Added get_display_size for "IMG" tags.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @author S.C. Chen <me578022@gmail.com>
+ * @author John Schlick
+ * @author Rus Carroll
+ * @version 1.5 ($Rev: 210 $)
+ * @package PlaceLocalInclude
+ * @subpackage simple_html_dom
+ */
+
+/**
+ * All of the Defines for the classes below.
+ * @author S.C. Chen <me578022@gmail.com>
+ */
+define('HDOM_TYPE_ELEMENT', 1);
+define('HDOM_TYPE_COMMENT', 2);
+define('HDOM_TYPE_TEXT',	3);
+define('HDOM_TYPE_ENDTAG',  4);
+define('HDOM_TYPE_ROOT',	5);
+define('HDOM_TYPE_UNKNOWN', 6);
+define('HDOM_QUOTE_DOUBLE', 0);
+define('HDOM_QUOTE_SINGLE', 1);
+define('HDOM_QUOTE_NO',	 3);
+define('HDOM_INFO_BEGIN',   0);
+define('HDOM_INFO_END',	 1);
+define('HDOM_INFO_QUOTE',   2);
+define('HDOM_INFO_SPACE',   3);
+define('HDOM_INFO_TEXT',	4);
+define('HDOM_INFO_INNER',   5);
+define('HDOM_INFO_OUTER',   6);
+define('HDOM_INFO_ENDSPACE',7);
+define('DEFAULT_TARGET_CHARSET', 'UTF-8');
+define('DEFAULT_BR_TEXT', "\r\n");
+define('DEFAULT_SPAN_TEXT', " ");
+define('MAX_FILE_SIZE', 600000);
+// helper functions
+// -----------------------------------------------------------------------------
+// get html dom from file
+// $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1.
+function file_get_html($url, $use_include_path = false, $context=null, $offset = -1, $maxLen=-1, $lowercase = true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+{
+	// We DO force the tags to be terminated.
+	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
+	// For sourceforge users: uncomment the next line and comment the retreive_url_contents line 2 lines down if it is not already done.
+	$contents = file_get_contents($url, $use_include_path, $context, $offset);
+	// Paperg - use our own mechanism for getting the contents as we want to control the timeout.
+	//$contents = retrieve_url_contents($url);
+	if (empty($contents) || strlen($contents) > MAX_FILE_SIZE)
+	{
+		return false;
+	}
+	// The second parameter can force the selectors to all be lowercase.
+	$dom->load($contents, $lowercase, $stripRN);
+	return $dom;
+}
+
+// get html dom from string
+function str_get_html($str, $lowercase=true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+{
+	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
+	if (empty($str) || strlen($str) > MAX_FILE_SIZE)
+	{
+		$dom->clear();
+		return false;
+	}
+	$dom->load($str, $lowercase, $stripRN);
+	return $dom;
+}
+
+// dump html dom tree
+function dump_html_tree($node, $show_attr=true, $deep=0)
+{
+	$node->dump($node);
+}
+
+
+/**
+ * simple html dom node
+ * PaperG - added ability for "find" routine to lowercase the value of the selector.
+ * PaperG - added $tag_start to track the start position of the tag in the total byte index
+ *
+ * @package PlaceLocalInclude
+ */
+class simple_html_dom_node
+{
+	public $nodetype = HDOM_TYPE_TEXT;
+	public $tag = 'text';
+	public $attr = array();
+	public $children = array();
+	public $nodes = array();
+	public $parent = null;
+	// The "info" array - see HDOM_INFO_... for what each element contains.
+	public $_ = array();
+	public $tag_start = 0;
+	private $dom = null;
+
+	function __construct($dom)
+	{
+		$this->dom = $dom;
+		$dom->nodes[] = $this;
+	}
+
+	function __destruct()
+	{
+		$this->clear();
+	}
+
+	function __toString()
+	{
+		return $this->outertext();
+	}
+
+	// clean up memory due to php5 circular references memory leak...
+	function clear()
+	{
+		$this->dom = null;
+		$this->nodes = null;
+		$this->parent = null;
+		$this->children = null;
+	}
+
+	// dump node's tree
+	function dump($show_attr=true, $deep=0)
+	{
+		$lead = str_repeat('	', $deep);
+
+		echo $lead.$this->tag;
+		if ($show_attr && count($this->attr)>0)
+		{
+			echo '(';
+			foreach ($this->attr as $k=>$v)
+				echo "[$k]=>\"".$this->$k.'", ';
+			echo ')';
+		}
+		echo "\n";
+
+		if ($this->nodes)
+		{
+			foreach ($this->nodes as $c)
+			{
+				$c->dump($show_attr, $deep+1);
+			}
+		}
+	}
+
+
+	// Debugging function to dump a single dom node with a bunch of information about it.
+	function dump_node($echo=true)
+	{
+
+		$string = $this->tag;
+		if (count($this->attr)>0)
+		{
+			$string .= '(';
+			foreach ($this->attr as $k=>$v)
+			{
+				$string .= "[$k]=>\"".$this->$k.'", ';
+			}
+			$string .= ')';
+		}
+		if (count($this->_)>0)
+		{
+			$string .= ' $_ (';
+			foreach ($this->_ as $k=>$v)
+			{
+				if (is_array($v))
+				{
+					$string .= "[$k]=>(";
+					foreach ($v as $k2=>$v2)
+					{
+						$string .= "[$k2]=>\"".$v2.'", ';
+					}
+					$string .= ")";
+				} else {
+					$string .= "[$k]=>\"".$v.'", ';
+				}
+			}
+			$string .= ")";
+		}
+
+		if (isset($this->text))
+		{
+			$string .= " text: (" . $this->text . ")";
+		}
+
+		$string .= " HDOM_INNER_INFO: '";
+		if (isset($node->_[HDOM_INFO_INNER]))
+		{
+			$string .= $node->_[HDOM_INFO_INNER] . "'";
+		}
+		else
+		{
+			$string .= ' NULL ';
+		}
+
+		$string .= " children: " . count($this->children);
+		$string .= " nodes: " . count($this->nodes);
+		$string .= " tag_start: " . $this->tag_start;
+		$string .= "\n";
+
+		if ($echo)
+		{
+			echo $string;
+			return;
+		}
+		else
+		{
+			return $string;
+		}
+	}
+
+	// returns the parent of node
+	// If a node is passed in, it will reset the parent of the current node to that one.
+	function parent($parent=null)
+	{
+		// I am SURE that this doesn't work properly.
+		// It fails to unset the current node from it's current parents nodes or children list first.
+		if ($parent !== null)
+		{
+			$this->parent = $parent;
+			$this->parent->nodes[] = $this;
+			$this->parent->children[] = $this;
+		}
+
+		return $this->parent;
+	}
+
+	// verify that node has children
+	function has_child()
+	{
+		return !empty($this->children);
+	}
+
+	// returns children of node
+	function children($idx=-1)
+	{
+		if ($idx===-1)
+		{
+			return $this->children;
+		}
+		if (isset($this->children[$idx]))
+		{
+			return $this->children[$idx];
+		}
+		return null;
+	}
+
+	// returns the first child of node
+	function first_child()
+	{
+		if (count($this->children)>0)
+		{
+			return $this->children[0];
+		}
+		return null;
+	}
+
+	// returns the last child of node
+	function last_child()
+	{
+		if (($count=count($this->children))>0)
+		{
+			return $this->children[$count-1];
+		}
+		return null;
+	}
+
+	// returns the next sibling of node
+	function next_sibling()
+	{
+		if ($this->parent===null)
+		{
+			return null;
+		}
+
+		$idx = 0;
+		$count = count($this->parent->children);
+		while ($idx<$count && $this!==$this->parent->children[$idx])
+		{
+			++$idx;
+		}
+		if (++$idx>=$count)
+		{
+			return null;
+		}
+		return $this->parent->children[$idx];
+	}
+
+	// returns the previous sibling of node
+	function prev_sibling()
+	{
+		if ($this->parent===null) return null;
+		$idx = 0;
+		$count = count($this->parent->children);
+		while ($idx<$count && $this!==$this->parent->children[$idx])
+			++$idx;
+		if (--$idx<0) return null;
+		return $this->parent->children[$idx];
+	}
+
+	// function to locate a specific ancestor tag in the path to the root.
+	function find_ancestor_tag($tag)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		// Start by including ourselves in the comparison.
+		$returnDom = $this;
+
+		while (!is_null($returnDom))
+		{
+			if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: " . $returnDom->tag); }
+
+			if ($returnDom->tag == $tag)
+			{
+				break;
+			}
+			$returnDom = $returnDom->parent;
+		}
+		return $returnDom;
+	}
+
+	// get dom node's inner html
+	function innertext()
+	{
+		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
+		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+
+		$ret = '';
+		foreach ($this->nodes as $n)
+			$ret .= $n->outertext();
+		return $ret;
+	}
+
+	// get dom node's outer text (with tag)
+	function outertext()
+	{
+		global $debug_object;
+		if (is_object($debug_object))
+		{
+			$text = '';
+			if ($this->tag == 'text')
+			{
+				if (!empty($this->text))
+				{
+					$text = " with text: " . $this->text;
+				}
+			}
+			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
+		}
+
+		if ($this->tag==='root') return $this->innertext();
+
+		// trigger callback
+		if ($this->dom && $this->dom->callback!==null)
+		{
+			call_user_func_array($this->dom->callback, array($this));
+		}
+
+		if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
+		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+
+		// render begin tag
+		if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]])
+		{
+			$ret = $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]->makeup();
+		} else {
+			$ret = "";
+		}
+
+		// render inner text
+		if (isset($this->_[HDOM_INFO_INNER]))
+		{
+			// If it's a br tag...  don't return the HDOM_INNER_INFO that we may or may not have added.
+			if ($this->tag != "br")
+			{
+				$ret .= $this->_[HDOM_INFO_INNER];
+			}
+		} else {
+			if ($this->nodes)
+			{
+				foreach ($this->nodes as $n)
+				{
+					$ret .= $this->convert_text($n->outertext());
+				}
+			}
+		}
+
+		// render end tag
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
+			$ret .= '</'.$this->tag.'>';
+		return $ret;
+	}
+
+	// get dom node's plain text
+	function text()
+	{
+		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
+		switch ($this->nodetype)
+		{
+			case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+			case HDOM_TYPE_COMMENT: return '';
+			case HDOM_TYPE_UNKNOWN: return '';
+		}
+		if (strcasecmp($this->tag, 'script')===0) return '';
+		if (strcasecmp($this->tag, 'style')===0) return '';
+
+		$ret = '';
+		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
+		// NOTE: This indicates that there is a problem where it's set to NULL without a clear happening.
+		// WHY is this happening?
+		if (!is_null($this->nodes))
+		{
+			foreach ($this->nodes as $n)
+			{
+				$ret .= $this->convert_text($n->text());
+			}
+
+			// If this node is a span... add a space at the end of it so multiple spans don't run into each other.  This is plaintext after all.
+			if ($this->tag == "span")
+			{
+				$ret .= $this->dom->default_span_text;
+			}
+
+
+		}
+		return $ret;
+	}
+
+	function xmltext()
+	{
+		$ret = $this->innertext();
+		$ret = str_ireplace('<![CDATA[', '', $ret);
+		$ret = str_replace(']]>', '', $ret);
+		return $ret;
+	}
+
+	// build node's text with tag
+	function makeup()
+	{
+		// text, comment, unknown
+		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+
+		$ret = '<'.$this->tag;
+		$i = -1;
+
+		foreach ($this->attr as $key=>$val)
+		{
+			++$i;
+
+			// skip removed attribute
+			if ($val===null || $val===false)
+				continue;
+
+			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
+			//no value attr: nowrap, checked selected...
+			if ($val===true)
+				$ret .= $key;
+			else {
+				switch ($this->_[HDOM_INFO_QUOTE][$i])
+				{
+					case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
+					case HDOM_QUOTE_SINGLE: $quote = '\''; break;
+					default: $quote = '';
+				}
+				$ret .= $key.$this->_[HDOM_INFO_SPACE][$i][1].'='.$this->_[HDOM_INFO_SPACE][$i][2].$quote.$val.$quote;
+			}
+		}
+		$ret = $this->dom->restore_noise($ret);
+		return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
+	}
+
+	// find elements by css selector
+	//PaperG - added ability for find to lowercase the value of the selector.
+	function find($selector, $idx=null, $lowercase=false)
+	{
+		$selectors = $this->parse_selector($selector);
+		if (($count=count($selectors))===0) return array();
+		$found_keys = array();
+
+		// find each selector
+		for ($c=0; $c<$count; ++$c)
+		{
+			// The change on the below line was documented on the sourceforge code tracker id 2788009
+			// used to be: if (($levle=count($selectors[0]))===0) return array();
+			if (($levle=count($selectors[$c]))===0) return array();
+			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
+
+			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
+
+			// handle descendant selectors, no recursive!
+			for ($l=0; $l<$levle; ++$l)
+			{
+				$ret = array();
+				foreach ($head as $k=>$v)
+				{
+					$n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k];
+					//PaperG - Pass this optional parameter on to the seek function.
+					$n->seek($selectors[$c][$l], $ret, $lowercase);
+				}
+				$head = $ret;
+			}
+
+			foreach ($head as $k=>$v)
+			{
+				if (!isset($found_keys[$k]))
+				{
+					$found_keys[$k] = 1;
+				}
+			}
+		}
+
+		// sort keys
+		ksort($found_keys);
+
+		$found = array();
+		foreach ($found_keys as $k=>$v)
+			$found[] = $this->dom->nodes[$k];
+
+		// return nth-element or array
+		if (is_null($idx)) return $found;
+		else if ($idx<0) $idx = count($found) + $idx;
+		return (isset($found[$idx])) ? $found[$idx] : null;
+	}
+
+	// seek for given conditions
+	// PaperG - added parameter to allow for case insensitive testing of the value of a selector.
+	protected function seek($selector, &$ret, $lowercase=false)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		list($tag, $key, $val, $exp, $no_key) = $selector;
+
+		// xpath index
+		if ($tag && $key && is_numeric($key))
+		{
+			$count = 0;
+			foreach ($this->children as $c)
+			{
+				if ($tag==='*' || $tag===$c->tag) {
+					if (++$count==$key) {
+						$ret[$c->_[HDOM_INFO_BEGIN]] = 1;
+						return;
+					}
+				}
+			}
+			return;
+		}
+
+		$end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
+		if ($end==0) {
+			$parent = $this->parent;
+			while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) {
+				$end -= 1;
+				$parent = $parent->parent;
+			}
+			$end += $parent->_[HDOM_INFO_END];
+		}
+
+		for ($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) {
+			$node = $this->dom->nodes[$i];
+
+			$pass = true;
+
+			if ($tag==='*' && !$key) {
+				if (in_array($node, $this->children, true))
+					$ret[$i] = 1;
+				continue;
+			}
+
+			// compare tag
+			if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;}
+			// compare key
+			if ($pass && $key) {
+				if ($no_key) {
+					if (isset($node->attr[$key])) $pass=false;
+				} else {
+					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+				}
+			}
+			// compare value
+			if ($pass && $key && $val  && $val!=='*') {
+				// If they have told us that this is a "plaintext" search then we want the plaintext of the node - right?
+				if ($key == "plaintext") {
+					// $node->plaintext actually returns $node->text();
+					$nodeKeyValue = $node->text();
+				} else {
+					// this is a normal search, we want the value of that attribute of the tag.
+					$nodeKeyValue = $node->attr[$key];
+				}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);}
+
+				//PaperG - If lowercase is set, do a case insensitive test of the value of the selector.
+				if ($lowercase) {
+					$check = $this->match($exp, strtolower($val), strtolower($nodeKeyValue));
+				} else {
+					$check = $this->match($exp, $val, $nodeKeyValue);
+				}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: " . ($check ? "true" : "false"));}
+
+				// handle multiple class
+				if (!$check && strcasecmp($key, 'class')===0) {
+					foreach (explode(' ',$node->attr[$key]) as $k) {
+						// Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form.
+						if (!empty($k)) {
+							if ($lowercase) {
+								$check = $this->match($exp, strtolower($val), strtolower($k));
+							} else {
+								$check = $this->match($exp, $val, $k);
+							}
+							if ($check) break;
+						}
+					}
+				}
+				if (!$check) $pass = false;
+			}
+			if ($pass) $ret[$i] = 1;
+			unset($node);
+		}
+		// It's passed by reference so this is actually what this function returns.
+		if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret);}
+	}
+
+	protected function match($exp, $pattern, $value) {
+		global $debug_object;
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+
+		switch ($exp) {
+			case '=':
+				return ($value===$pattern);
+			case '!=':
+				return ($value!==$pattern);
+			case '^=':
+				return preg_match("/^".preg_quote($pattern,'/')."/", $value);
+			case '$=':
+				return preg_match("/".preg_quote($pattern,'/')."$/", $value);
+			case '*=':
+				if ($pattern[0]=='/') {
+					return preg_match($pattern, $value);
+				}
+				return preg_match("/".$pattern."/i", $value);
+		}
+		return false;
+	}
+
+	protected function parse_selector($selector_string) {
+		global $debug_object;
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+
+		// pattern of CSS selectors, modified from mootools
+		// Paperg: Add the colon to the attrbute, so that it properly finds <tag attr:ibute="something" > like google does.
+		// Note: if you try to look at this attribute, yo MUST use getAttribute since $dom->x:y will fail the php syntax check.
+// Notice the \[ starting the attbute?  and the @? following?  This implies that an attribute can begin with an @ sign that is not captured.
+// This implies that an html attribute specifier may start with an @ sign that is NOT captured by the expression.
+// farther study is required to determine of this should be documented or removed.
+//		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
+		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
+		preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER);
+		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);}
+
+		$selectors = array();
+		$result = array();
+		//print_r($matches);
+
+		foreach ($matches as $m) {
+			$m[0] = trim($m[0]);
+			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			// for browser generated xpath
+			if ($m[1]==='tbody') continue;
+
+			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
+			if (!empty($m[2])) {$key='id'; $val=$m[2];}
+			if (!empty($m[3])) {$key='class'; $val=$m[3];}
+			if (!empty($m[4])) {$key=$m[4];}
+			if (!empty($m[5])) {$exp=$m[5];}
+			if (!empty($m[6])) {$val=$m[6];}
+
+			// convert to lowercase
+			if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);}
+			//elements that do NOT have the specified attribute
+			if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;}
+
+			$result[] = array($tag, $key, $val, $exp, $no_key);
+			if (trim($m[7])===',') {
+				$selectors[] = $result;
+				$result = array();
+			}
+		}
+		if (count($result)>0)
+			$selectors[] = $result;
+		return $selectors;
+	}
+
+	function __get($name)
+	{
+		if (isset($this->attr[$name]))
+		{
+			return $this->convert_text($this->attr[$name]);
+		}
+		switch ($name)
+		{
+			case 'outertext': return $this->outertext();
+			case 'innertext': return $this->innertext();
+			case 'plaintext': return $this->text();
+			case 'xmltext': return $this->xmltext();
+			default: return array_key_exists($name, $this->attr);
+		}
+	}
+
+	function __set($name, $value)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+
+		switch ($name)
+		{
+			case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
+			case 'innertext':
+				if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
+				return $this->_[HDOM_INFO_INNER] = $value;
+		}
+		if (!isset($this->attr[$name]))
+		{
+			$this->_[HDOM_INFO_SPACE][] = array(' ', '', '');
+			$this->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
+		}
+		$this->attr[$name] = $value;
+	}
+
+	function __isset($name)
+	{
+		switch ($name)
+		{
+			case 'outertext': return true;
+			case 'innertext': return true;
+			case 'plaintext': return true;
+		}
+		//no value attr: nowrap, checked selected...
+		return (array_key_exists($name, $this->attr)) ? true : isset($this->attr[$name]);
+	}
+
+	function __unset($name) {
+		if (isset($this->attr[$name]))
+			unset($this->attr[$name]);
+	}
+
+	// PaperG - Function to convert the text from one character set to another if the two sets are not the same.
+	function convert_text($text)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+
+		$converted_text = $text;
+
+		$sourceCharset = "";
+		$targetCharset = "";
+
+		if ($this->dom)
+		{
+			$sourceCharset = strtoupper($this->dom->_charset);
+			$targetCharset = strtoupper($this->dom->_target_charset);
+		}
+		if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);}
+
+		if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0))
+		{
+			// Check if the reported encoding could have been incorrect and the text is actually already UTF-8
+			if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text)))
+			{
+				$converted_text = $text;
+			}
+			else
+			{
+				$converted_text = iconv($sourceCharset, $targetCharset, $text);
+			}
+		}
+
+		// Lets make sure that we don't have that silly BOM issue with any of the utf-8 text we output.
+		if ($targetCharset == 'UTF-8')
+		{
+			if (substr($converted_text, 0, 3) == "\xef\xbb\xbf")
+			{
+				$converted_text = substr($converted_text, 3);
+			}
+			if (substr($converted_text, -3) == "\xef\xbb\xbf")
+			{
+				$converted_text = substr($converted_text, 0, -3);
+			}
+		}
+
+		return $converted_text;
+	}
+
+	/**
+	* Returns true if $string is valid UTF-8 and false otherwise.
+	*
+	* @param mixed $str String to be tested
+	* @return boolean
+	*/
+	static function is_utf8($str)
+	{
+		$c=0; $b=0;
+		$bits=0;
+		$len=strlen($str);
+		for($i=0; $i<$len; $i++)
+		{
+			$c=ord($str[$i]);
+			if($c > 128)
+			{
+				if(($c >= 254)) return false;
+				elseif($c >= 252) $bits=6;
+				elseif($c >= 248) $bits=5;
+				elseif($c >= 240) $bits=4;
+				elseif($c >= 224) $bits=3;
+				elseif($c >= 192) $bits=2;
+				else return false;
+				if(($i+$bits) > $len) return false;
+				while($bits > 1)
+				{
+					$i++;
+					$b=ord($str[$i]);
+					if($b < 128 || $b > 191) return false;
+					$bits--;
+				}
+			}
+		}
+		return true;
+	}
+	/*
+	function is_utf8($string)
+	{
+		//this is buggy
+		return (utf8_encode(utf8_decode($string)) == $string);
+	}
+	*/
+
+	/**
+	 * Function to try a few tricks to determine the displayed size of an img on the page.
+	 * NOTE: This will ONLY work on an IMG tag. Returns FALSE on all other tag types.
+	 *
+	 * @author John Schlick
+	 * @version April 19 2012
+	 * @return array an array containing the 'height' and 'width' of the image on the page or -1 if we can't figure it out.
+	 */
+	function get_display_size()
+	{
+		global $debug_object;
+
+		$width = -1;
+		$height = -1;
+
+		if ($this->tag !== 'img')
+		{
+			return false;
+		}
+
+		// See if there is aheight or width attribute in the tag itself.
+		if (isset($this->attr['width']))
+		{
+			$width = $this->attr['width'];
+		}
+
+		if (isset($this->attr['height']))
+		{
+			$height = $this->attr['height'];
+		}
+
+		// Now look for an inline style.
+		if (isset($this->attr['style']))
+		{
+			// Thanks to user gnarf from stackoverflow for this regular expression.
+			$attributes = array();
+			preg_match_all("/([\w-]+)\s*:\s*([^;]+)\s*;?/", $this->attr['style'], $matches, PREG_SET_ORDER);
+			foreach ($matches as $match) {
+			  $attributes[$match[1]] = $match[2];
+			}
+
+			// If there is a width in the style attributes:
+			if (isset($attributes['width']) && $width == -1)
+			{
+				// check that the last two characters are px (pixels)
+				if (strtolower(substr($attributes['width'], -2)) == 'px')
+				{
+					$proposed_width = substr($attributes['width'], 0, -2);
+					// Now make sure that it's an integer and not something stupid.
+					if (filter_var($proposed_width, FILTER_VALIDATE_INT))
+					{
+						$width = $proposed_width;
+					}
+				}
+			}
+
+			// If there is a width in the style attributes:
+			if (isset($attributes['height']) && $height == -1)
+			{
+				// check that the last two characters are px (pixels)
+				if (strtolower(substr($attributes['height'], -2)) == 'px')
+				{
+					$proposed_height = substr($attributes['height'], 0, -2);
+					// Now make sure that it's an integer and not something stupid.
+					if (filter_var($proposed_height, FILTER_VALIDATE_INT))
+					{
+						$height = $proposed_height;
+					}
+				}
+			}
+
+		}
+
+		// Future enhancement:
+		// Look in the tag to see if there is a class or id specified that has a height or width attribute to it.
+
+		// Far future enhancement
+		// Look at all the parent tags of this image to see if they specify a class or id that has an img selector that specifies a height or width
+		// Note that in this case, the class or id will have the img subselector for it to apply to the image.
+
+		// ridiculously far future development
+		// If the class or id is specified in a SEPARATE css file thats not on the page, go get it and do what we were just doing for the ones on the page.
+
+		$result = array('height' => $height,
+						'width' => $width);
+		return $result;
+	}
+
+	// camel naming conventions
+	function getAllAttributes() {return $this->attr;}
+	function getAttribute($name) {return $this->__get($name);}
+	function setAttribute($name, $value) {$this->__set($name, $value);}
+	function hasAttribute($name) {return $this->__isset($name);}
+	function removeAttribute($name) {$this->__set($name, null);}
+	function getElementById($id) {return $this->find("#$id", 0);}
+	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
+	function getElementByTagName($name) {return $this->find($name, 0);}
+	function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);}
+	function parentNode() {return $this->parent();}
+	function childNodes($idx=-1) {return $this->children($idx);}
+	function firstChild() {return $this->first_child();}
+	function lastChild() {return $this->last_child();}
+	function nextSibling() {return $this->next_sibling();}
+	function previousSibling() {return $this->prev_sibling();}
+	function hasChildNodes() {return $this->has_child();}
+	function nodeName() {return $this->tag;}
+	function appendChild($node) {$node->parent($this); return $node;}
+
+}
+
+/**
+ * simple html dom parser
+ * Paperg - in the find routine: allow us to specify that we want case insensitive testing of the value of the selector.
+ * Paperg - change $size from protected to public so we can easily access it
+ * Paperg - added ForceTagsClosed in the constructor which tells us whether we trust the html or not.  Default is to NOT trust it.
+ *
+ * @package PlaceLocalInclude
+ */
+class simple_html_dom
+{
+	public $root = null;
+	public $nodes = array();
+	public $callback = null;
+	public $lowercase = false;
+	// Used to keep track of how large the text was when we started.
+	public $original_size;
+	public $size;
+	protected $pos;
+	protected $doc;
+	protected $char;
+	protected $cursor;
+	protected $parent;
+	protected $noise = array();
+	protected $token_blank = " \t\r\n";
+	protected $token_equal = ' =/>';
+	protected $token_slash = " />\r\n\t";
+	protected $token_attr = ' >';
+	// Note that this is referenced by a child node, and so it needs to be public for that node to see this information.
+	public $_charset = '';
+	public $_target_charset = '';
+	protected $default_br_text = "";
+	public $default_span_text = "";
+
+	// use isset instead of in_array, performance boost about 30%...
+	protected $self_closing_tags = array('img'=>1, 'br'=>1, 'input'=>1, 'meta'=>1, 'link'=>1, 'hr'=>1, 'base'=>1, 'embed'=>1, 'spacer'=>1);
+	protected $block_tags = array('root'=>1, 'body'=>1, 'form'=>1, 'div'=>1, 'span'=>1, 'table'=>1);
+	// Known sourceforge issue #2977341
+	// B tags that are not closed cause us to return everything to the end of the document.
+	protected $optional_closing_tags = array(
+		'tr'=>array('tr'=>1, 'td'=>1, 'th'=>1),
+		'th'=>array('th'=>1),
+		'td'=>array('td'=>1),
+		'li'=>array('li'=>1),
+		'dt'=>array('dt'=>1, 'dd'=>1),
+		'dd'=>array('dd'=>1, 'dt'=>1),
+		'dl'=>array('dd'=>1, 'dt'=>1),
+		'p'=>array('p'=>1),
+		'nobr'=>array('nobr'=>1),
+		'b'=>array('b'=>1),
+		'option'=>array('option'=>1),
+	);
+
+	function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	{
+		if ($str)
+		{
+			if (preg_match("/^http:\/\//i",$str) || is_file($str))
+			{
+				$this->load_file($str);
+			}
+			else
+			{
+				$this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
+			}
+		}
+		// Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html.
+		if (!$forceTagsClosed) {
+			$this->optional_closing_array=array();
+		}
+		$this->_target_charset = $target_charset;
+	}
+
+	function __destruct()
+	{
+		$this->clear();
+	}
+
+	// load html from string
+	function load($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	{
+		global $debug_object;
+
+		// prepare
+		$this->prepare($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
+		// strip out cdata
+		$this->remove_noise("'<!\[CDATA\[(.*?)\]\]>'is", true);
+		// strip out comments
+		$this->remove_noise("'<!--(.*?)-->'is");
+		// Per sourceforge http://sourceforge.net/tracker/?func=detail&aid=2949097&group_id=218559&atid=1044037
+		// Script tags removal now preceeds style tag removal.
+		// strip out <script> tags
+		$this->remove_noise("'<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>'is");
+		$this->remove_noise("'<\s*script\s*>(.*?)<\s*/\s*script\s*>'is");
+		// strip out <style> tags
+		$this->remove_noise("'<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>'is");
+		$this->remove_noise("'<\s*style\s*>(.*?)<\s*/\s*style\s*>'is");
+		// strip out preformatted tags
+		$this->remove_noise("'<\s*(?:code)[^>]*>(.*?)<\s*/\s*(?:code)\s*>'is");
+		// strip out server side scripts
+		$this->remove_noise("'(<\?)(.*?)(\?>)'s", true);
+		// strip smarty scripts
+		$this->remove_noise("'(\{\w)(.*?)(\})'s", true);
+
+		// parsing
+		while ($this->parse());
+		// end
+		$this->root->_[HDOM_INFO_END] = $this->cursor;
+		$this->parse_charset();
+
+		// make load function chainable
+		return $this;
+
+	}
+
+	// load html from file
+	function load_file()
+	{
+		$args = func_get_args();
+		$this->load(call_user_func_array('file_get_contents', $args), true);
+		// Throw an error if we can't properly load the dom.
+		if (($error=error_get_last())!==null) {
+			$this->clear();
+			return false;
+		}
+	}
+
+	// set callback function
+	function set_callback($function_name)
+	{
+		$this->callback = $function_name;
+	}
+
+	// remove callback function
+	function remove_callback()
+	{
+		$this->callback = null;
+	}
+
+	// save dom as string
+	function save($filepath='')
+	{
+		$ret = $this->root->innertext();
+		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		return $ret;
+	}
+
+	// find dom node by css selector
+	// Paperg - allow us to specify that we want case insensitive testing of the value of the selector.
+	function find($selector, $idx=null, $lowercase=false)
+	{
+		return $this->root->find($selector, $idx, $lowercase);
+	}
+
+	// clean up memory due to php5 circular references memory leak...
+	function clear()
+	{
+		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
+		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
+		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
+		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
+		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
+		unset($this->doc);
+		unset($this->noise);
+	}
+
+	function dump($show_attr=true)
+	{
+		$this->root->dump($show_attr);
+	}
+
+	// prepare HTML data and init everything
+	protected function prepare($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	{
+		$this->clear();
+
+		// set the length of content before we do anything to it.
+		$this->size = strlen($str);
+		// Save the original size of the html that we got in.  It might be useful to someone.
+		$this->original_size = $this->size;
+
+		//before we save the string as the doc...  strip out the \r \n's if we are told to.
+		if ($stripRN) {
+			$str = str_replace("\r", " ", $str);
+			$str = str_replace("\n", " ", $str);
+
+			// set the length of content since we have changed it.
+			$this->size = strlen($str);
+		}
+
+		$this->doc = $str;
+		$this->pos = 0;
+		$this->cursor = 1;
+		$this->noise = array();
+		$this->nodes = array();
+		$this->lowercase = $lowercase;
+		$this->default_br_text = $defaultBRText;
+		$this->default_span_text = $defaultSpanText;
+		$this->root = new simple_html_dom_node($this);
+		$this->root->tag = 'root';
+		$this->root->_[HDOM_INFO_BEGIN] = -1;
+		$this->root->nodetype = HDOM_TYPE_ROOT;
+		$this->parent = $this->root;
+		if ($this->size>0) $this->char = $this->doc[0];
+	}
+
+	// parse html content
+	protected function parse()
+	{
+		if (($s = $this->copy_until_char('<'))==='')
+		{
+			return $this->read_tag();
+		}
+
+		// text
+		$node = new simple_html_dom_node($this);
+		++$this->cursor;
+		$node->_[HDOM_INFO_TEXT] = $s;
+		$this->link_nodes($node, false);
+		return true;
+	}
+
+	// PAPERG - dkchou - added this to try to identify the character set of the page we have just parsed so we know better how to spit it out later.
+	// NOTE:  IF you provide a routine called get_last_retrieve_url_contents_content_type which returns the CURLINFO_CONTENT_TYPE from the last curl_exec
+	// (or the content_type header from the last transfer), we will parse THAT, and if a charset is specified, we will use it over any other mechanism.
+	protected function parse_charset()
+	{
+		global $debug_object;
+
+		$charset = null;
+
+		if (function_exists('get_last_retrieve_url_contents_content_type'))
+		{
+			$contentTypeHeader = get_last_retrieve_url_contents_content_type();
+			$success = preg_match('/charset=(.+)/', $contentTypeHeader, $matches);
+			if ($success)
+			{
+				$charset = $matches[1];
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: ' . $charset);}
+			}
+
+		}
+
+		if (empty($charset))
+		{
+			$el = $this->root->find('meta[http-equiv=Content-Type]',0, true);
+			if (!empty($el))
+			{
+				$fullvalue = $el->content;
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found' . $fullvalue);}
+
+				if (!empty($fullvalue))
+				{
+					$success = preg_match('/charset=(.+)/i', $fullvalue, $matches);
+					if ($success)
+					{
+						$charset = $matches[1];
+					}
+					else
+					{
+						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
+						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
+						$charset = 'ISO-8859-1';
+					}
+				}
+			}
+		}
+
+		// If we couldn't find a charset above, then lets try to detect one based on the text we got...
+		if (empty($charset))
+		{
+			// Use this in case mb_detect_charset isn't installed/loaded on this machine.
+			$charset = false;
+			if (function_exists('mb_detect_encoding'))
+			{
+				// Have php try to detect the encoding from the text given to us.
+				$charset = mb_detect_encoding($this->root->plaintext . "ascii", $encoding_list = array( "UTF-8", "CP1252" ) );
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: ' . $charset);}
+			}
+
+			// and if this doesn't work...  then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need...
+			if ($charset === false)
+			{
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8');}
+				$charset = 'UTF-8';
+			}
+		}
+
+		// Since CP1252 is a superset, if we get one of it's subsets, we want it instead.
+		if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1')))
+		{
+			if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing ' . $charset . ' with CP1252 as its a superset');}
+			$charset = 'CP1252';
+		}
+
+		if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - ' . $charset);}
+
+		return $this->_charset = $charset;
+	}
+
+	// read tag info
+	protected function read_tag()
+	{
+		if ($this->char!=='<')
+		{
+			$this->root->_[HDOM_INFO_END] = $this->cursor;
+			return false;
+		}
+		$begin_tag_pos = $this->pos;
+		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+
+		// end tag
+		if ($this->char==='/')
+		{
+			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			// This represents the change in the simple_html_dom trunk from revision 180 to 181.
+			// $this->skip($this->token_blank_t);
+			$this->skip($this->token_blank);
+			$tag = $this->copy_until_char('>');
+
+			// skip attributes in end tag
+			if (($pos = strpos($tag, ' '))!==false)
+				$tag = substr($tag, 0, $pos);
+
+			$parent_lower = strtolower($this->parent->tag);
+			$tag_lower = strtolower($tag);
+
+			if ($parent_lower!==$tag_lower)
+			{
+				if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower]))
+				{
+					$this->parent->_[HDOM_INFO_END] = 0;
+					$org_parent = $this->parent;
+
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+						$this->parent = $this->parent->parent;
+
+					if (strtolower($this->parent->tag)!==$tag_lower) {
+						$this->parent = $org_parent; // restore origonal parent
+						if ($this->parent->parent) $this->parent = $this->parent->parent;
+						$this->parent->_[HDOM_INFO_END] = $this->cursor;
+						return $this->as_text_node($tag);
+					}
+				}
+				else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
+				{
+					$this->parent->_[HDOM_INFO_END] = 0;
+					$org_parent = $this->parent;
+
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+						$this->parent = $this->parent->parent;
+
+					if (strtolower($this->parent->tag)!==$tag_lower)
+					{
+						$this->parent = $org_parent; // restore origonal parent
+						$this->parent->_[HDOM_INFO_END] = $this->cursor;
+						return $this->as_text_node($tag);
+					}
+				}
+				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				{
+					$this->parent->_[HDOM_INFO_END] = 0;
+					$this->parent = $this->parent->parent;
+				}
+				else
+					return $this->as_text_node($tag);
+			}
+
+			$this->parent->_[HDOM_INFO_END] = $this->cursor;
+			if ($this->parent->parent) $this->parent = $this->parent->parent;
+
+			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			return true;
+		}
+
+		$node = new simple_html_dom_node($this);
+		$node->_[HDOM_INFO_BEGIN] = $this->cursor;
+		++$this->cursor;
+		$tag = $this->copy_until($this->token_slash);
+		$node->tag_start = $begin_tag_pos;
+
+		// doctype, cdata & comments...
+		if (isset($tag[0]) && $tag[0]==='!') {
+			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
+
+			if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') {
+				$node->nodetype = HDOM_TYPE_COMMENT;
+				$node->tag = 'comment';
+			} else {
+				$node->nodetype = HDOM_TYPE_UNKNOWN;
+				$node->tag = 'unknown';
+			}
+			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			$this->link_nodes($node, true);
+			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			return true;
+		}
+
+		// text
+		if ($pos=strpos($tag, '<')!==false) {
+			$tag = '<' . substr($tag, 0, -1);
+			$node->_[HDOM_INFO_TEXT] = $tag;
+			$this->link_nodes($node, false);
+			$this->char = $this->doc[--$this->pos]; // prev
+			return true;
+		}
+
+		if (!preg_match("/^[\w-:]+$/", $tag)) {
+			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
+			if ($this->char==='<') {
+				$this->link_nodes($node, false);
+				return true;
+			}
+
+			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			$this->link_nodes($node, false);
+			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			return true;
+		}
+
+		// begin tag
+		$node->nodetype = HDOM_TYPE_ELEMENT;
+		$tag_lower = strtolower($tag);
+		$node->tag = ($this->lowercase) ? $tag_lower : $tag;
+
+		// handle optional closing tags
+		if (isset($this->optional_closing_tags[$tag_lower]) )
+		{
+			while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)]))
+			{
+				$this->parent->_[HDOM_INFO_END] = 0;
+				$this->parent = $this->parent->parent;
+			}
+			$node->parent = $this->parent;
+		}
+
+		$guard = 0; // prevent infinity loop
+		$space = array($this->copy_skip($this->token_blank), '', '');
+
+		// attributes
+		do
+		{
+			if ($this->char!==null && $space[0]==='')
+			{
+				break;
+			}
+			$name = $this->copy_until($this->token_equal);
+			if ($guard===$this->pos)
+			{
+				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				continue;
+			}
+			$guard = $this->pos;
+
+			// handle endless '<'
+			if ($this->pos>=$this->size-1 && $this->char!=='>') {
+				$node->nodetype = HDOM_TYPE_TEXT;
+				$node->_[HDOM_INFO_END] = 0;
+				$node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name;
+				$node->tag = 'text';
+				$this->link_nodes($node, false);
+				return true;
+			}
+
+			// handle mismatch '<'
+			if ($this->doc[$this->pos-1]=='<') {
+				$node->nodetype = HDOM_TYPE_TEXT;
+				$node->tag = 'text';
+				$node->attr = array();
+				$node->_[HDOM_INFO_END] = 0;
+				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1);
+				$this->pos -= 2;
+				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->link_nodes($node, false);
+				return true;
+			}
+
+			if ($name!=='/' && $name!=='') {
+				$space[1] = $this->copy_skip($this->token_blank);
+				$name = $this->restore_noise($name);
+				if ($this->lowercase) $name = strtolower($name);
+				if ($this->char==='=') {
+					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+					$this->parse_attr($node, $name, $space);
+				}
+				else {
+					//no value attr: nowrap, checked selected...
+					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
+					$node->attr[$name] = true;
+					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+				}
+				$node->_[HDOM_INFO_SPACE][] = $space;
+				$space = array($this->copy_skip($this->token_blank), '', '');
+			}
+			else
+				break;
+		} while ($this->char!=='>' && $this->char!=='/');
+
+		$this->link_nodes($node, true);
+		$node->_[HDOM_INFO_ENDSPACE] = $space[0];
+
+		// check self closing
+		if ($this->copy_until_char_escape('>')==='/')
+		{
+			$node->_[HDOM_INFO_ENDSPACE] .= '/';
+			$node->_[HDOM_INFO_END] = 0;
+		}
+		else
+		{
+			// reset parent
+			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
+		}
+		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+
+		// If it's a BR tag, we need to set it's text to the default text.
+		// This way when we see it in plaintext, we can generate formatting that the user wants.
+		// since a br tag never has sub nodes, this works well.
+		if ($node->tag == "br")
+		{
+			$node->_[HDOM_INFO_INNER] = $this->default_br_text;
+		}
+
+		return true;
+	}
+
+	// parse attributes
+	protected function parse_attr($node, $name, &$space)
+	{
+		// Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
+		// If the attribute is already defined inside a tag, only pay atetntion to the first one as opposed to the last one.
+		if (isset($node->attr[$name]))
+		{
+			return;
+		}
+
+		$space[2] = $this->copy_skip($this->token_blank);
+		switch ($this->char) {
+			case '"':
+				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
+				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"'));
+				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				break;
+			case '\'':
+				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE;
+				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\''));
+				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				break;
+			default:
+				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
+				$node->attr[$name] = $this->restore_noise($this->copy_until($this->token_attr));
+		}
+		// PaperG: Attributes should not have \r or \n in them, that counts as html whitespace.
+		$node->attr[$name] = str_replace("\r", "", $node->attr[$name]);
+		$node->attr[$name] = str_replace("\n", "", $node->attr[$name]);
+		// PaperG: If this is a "class" selector, lets get rid of the preceeding and trailing space since some people leave it in the multi class case.
+		if ($name == "class") {
+			$node->attr[$name] = trim($node->attr[$name]);
+		}
+	}
+
+	// link node's parent
+	protected function link_nodes(&$node, $is_child)
+	{
+		$node->parent = $this->parent;
+		$this->parent->nodes[] = $node;
+		if ($is_child)
+		{
+			$this->parent->children[] = $node;
+		}
+	}
+
+	// as a text node
+	protected function as_text_node($tag)
+	{
+		$node = new simple_html_dom_node($this);
+		++$this->cursor;
+		$node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
+		$this->link_nodes($node, false);
+		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		return true;
+	}
+
+	protected function skip($chars)
+	{
+		$this->pos += strspn($this->doc, $chars, $this->pos);
+		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+	}
+
+	protected function copy_skip($chars)
+	{
+		$pos = $this->pos;
+		$len = strspn($this->doc, $chars, $pos);
+		$this->pos += $len;
+		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		if ($len===0) return '';
+		return substr($this->doc, $pos, $len);
+	}
+
+	protected function copy_until($chars)
+	{
+		$pos = $this->pos;
+		$len = strcspn($this->doc, $chars, $pos);
+		$this->pos += $len;
+		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		return substr($this->doc, $pos, $len);
+	}
+
+	protected function copy_until_char($char)
+	{
+		if ($this->char===null) return '';
+
+		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
+			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+			$this->char = null;
+			$this->pos = $this->size;
+			return $ret;
+		}
+
+		if ($pos===$this->pos) return '';
+		$pos_old = $this->pos;
+		$this->char = $this->doc[$pos];
+		$this->pos = $pos;
+		return substr($this->doc, $pos_old, $pos-$pos_old);
+	}
+
+	protected function copy_until_char_escape($char)
+	{
+		if ($this->char===null) return '';
+
+		$start = $this->pos;
+		while (1)
+		{
+			if (($pos = strpos($this->doc, $char, $start))===false)
+			{
+				$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+				$this->char = null;
+				$this->pos = $this->size;
+				return $ret;
+			}
+
+			if ($pos===$this->pos) return '';
+
+			if ($this->doc[$pos-1]==='\\') {
+				$start = $pos+1;
+				continue;
+			}
+
+			$pos_old = $this->pos;
+			$this->char = $this->doc[$pos];
+			$this->pos = $pos;
+			return substr($this->doc, $pos_old, $pos-$pos_old);
+		}
+	}
+
+	// remove noise from html content
+	// save the noise in the $this->noise array.
+	protected function remove_noise($pattern, $remove_tag=false)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		$count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
+
+		for ($i=$count-1; $i>-1; --$i)
+		{
+			$key = '___noise___'.sprintf('% 5d', count($this->noise)+1000);
+			if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: ' . $key); }
+			$idx = ($remove_tag) ? 0 : 1;
+			$this->noise[$key] = $matches[$i][$idx][0];
+			$this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
+		}
+
+		// reset the length of content
+		$this->size = strlen($this->doc);
+		if ($this->size>0)
+		{
+			$this->char = $this->doc[0];
+		}
+	}
+
+	// restore noise to html content
+	function restore_noise($text)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		while (($pos=strpos($text, '___noise___'))!==false)
+		{
+			// Sometimes there is a broken piece of markup, and we don't GET the pos+11 etc... token which indicates a problem outside of us...
+			if (strlen($text) > $pos+15)
+			{
+				$key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13].$text[$pos+14].$text[$pos+15];
+				if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: ' . $key); }
+
+				if (isset($this->noise[$key]))
+				{
+					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
+				}
+				else
+				{
+					// do this to prevent an infinite loop.
+					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
+				}
+			}
+			else
+			{
+				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
+				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);
+			}
+		}
+		return $text;
+	}
+
+	// Sometimes we NEED one of the noise elements.
+	function search_noise($text)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		foreach($this->noise as $noiseElement)
+		{
+			if (strpos($noiseElement, $text)!==false)
+			{
+				return $noiseElement;
+			}
+		}
+	}
+	function __toString()
+	{
+		return $this->root->innertext();
+	}
+
+	function __get($name)
+	{
+		switch ($name)
+		{
+			case 'outertext':
+				return $this->root->innertext();
+			case 'innertext':
+				return $this->root->innertext();
+			case 'plaintext':
+				return $this->root->text();
+			case 'charset':
+				return $this->_charset;
+			case 'target_charset':
+				return $this->_target_charset;
+		}
+	}
+
+	// camel naming conventions
+	function childNodes($idx=-1) {return $this->root->childNodes($idx);}
+	function firstChild() {return $this->root->first_child();}
+	function lastChild() {return $this->root->last_child();}
+	function createElement($name, $value=null) {return @str_get_html("<$name>$value</$name>")->first_child();}
+	function createTextNode($value) {return @end(str_get_html($value)->nodes);}
+	function getElementById($id) {return $this->find("#$id", 0);}
+	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
+	function getElementByTagName($name) {return $this->find($name, 0);}
+	function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
+	function loadFile() {$args = func_get_args();$this->load_file($args);}
+}
+
+?>
\ No newline at end of file
diff --git a/panels/lsfView/style.less b/panels/lsfView/style.less
new file mode 100755
index 0000000000000000000000000000000000000000..329030adc9f7730d4bee3fdce1bfdbfd8814b132
--- /dev/null
+++ b/panels/lsfView/style.less
@@ -0,0 +1,18 @@
+/* Table */
+#mensaPlanTable {
+	font-weight: bold;
+}
+
+#mensaPlanTableHead {
+	background-color: #0000f0;
+	color: #000000;
+}
+
+#mensaPlanTableBody {
+	background-color: #ffffff;
+	color: #000000;
+}
+
+#mensaPlanTitleBar {
+	text-align: center;
+}
\ No newline at end of file
diff --git a/panels/lsfView/subject.php b/panels/lsfView/subject.php
new file mode 100755
index 0000000000000000000000000000000000000000..3ae7b0a37d2661c7097d246bf29469d2a0b8c41e
--- /dev/null
+++ b/panels/lsfView/subject.php
@@ -0,0 +1,74 @@
+<?php
+class SUBJECT {
+	private $searchName = "";
+	private $name = "";
+	private $short = "";
+	private $events = array ();
+	function __construct($searchName = "", $name, $short = "") {
+		$this->searchName = $searchName;
+		$this->name = $name;
+		$this->short = $short;
+	}
+	public function getSearchName() {
+		return $this->searchName;
+	}
+	public function getName() {
+		return $this->name;
+	}
+	public function getShort() {
+		return $this->short;
+	}
+	public function getEvents() {
+		return $this->events;
+	}
+	public function setSearchName($searchName) {
+		$this->searchName = $searchName;
+	}
+	public function setName($name) {
+		$this->name = $name;
+	}
+	public function setShort($short) {
+		$this->short = $short;
+	}
+	public function addEvent($event) {
+		array_push ( $this->events, $event );
+	}
+	public function addEvents($events) {
+		foreach ( $events as $event ) {
+			array_push ( $this->events, $event );
+		}
+	}
+	
+	//TODO
+	public function toJson($inc_name = true, $inc_short = true) {
+		$kommata = false;
+		$json = '';
+		if($inc_name){
+			$json = '"Name": "'. $this->name . '", ';
+		}
+		if($inc_short){
+			$json .= '"Short": "'. $this->short . '", ';
+		}
+		$json .= '"Events": [';
+		foreach ( $this->events as $event ) {
+			if ($kommata) {
+				$json .= ',';
+			} else {
+				$kommata = true;
+			}
+			$json .= $event->toJson ();
+		}
+		$json .= ']';
+		return $json;
+	}
+	public function __toString() {
+		$string = "Name: " . $this->name;
+		$string .= ", Short: ".$this->short;
+		$string .= ", Events: ";
+		foreach ( $this->events as $event ) {
+			$string .= $event;
+		}
+		return $string;
+	}
+}
+?>
\ No newline at end of file
diff --git a/panels/lsfView/template.html b/panels/lsfView/template.html
new file mode 100755
index 0000000000000000000000000000000000000000..cae871626af3982e77d94ebd9b77961a9785f98f
--- /dev/null
+++ b/panels/lsfView/template.html
@@ -0,0 +1,26 @@
+<div id="tabs">
+	<div id="mensaPlanTitleBar"></div>
+	<ul>
+		<li><a href="#tab-1">Normale Counter</a></li>
+		<li><a href="#tab-2">Grill Counter</a></li>
+		<li><a href="#tab-3">Sonstige Counter</a></li>
+	</ul>
+	<div id="tab-1">
+		<table id="mensaPlanTable1" style="width:100%;height:100%">
+			<tbody id="mensaPlanTable1Body">
+			</tbody>
+		</table>
+	</div>
+	<div id="tab-2">
+		<table id="mensaPlanTable2" style="width:100%;height:100%">
+			<tbody id="mensaPlanTable2Body">
+			</tbody>
+		</table>
+	</div>
+	<div id="tab-3">
+		<table id="mensaPlanTable3" style="width:100%;height:100%">
+			<tbody id="mensaPlanTable3Body">
+			</tbody>
+		</table>
+	</div>
+</div>
diff --git a/panels/mensaPlan/config.php.skel b/panels/mensaPlan/config.php.skel
index 58ccd39a5b593448282980f1a64ef396db21c68d..3ff769b5d8579846eba70a1bd289e82acab3d04a 100644
--- a/panels/mensaPlan/config.php.skel
+++ b/panels/mensaPlan/config.php.skel
@@ -8,14 +8,6 @@ $PARSE_DAYLIST = array (
 		"donnerstag",
 		"freitag" 
 );
-$DO_SQL = true;
-$DO_JSON = true;
-
-// SQL
-$SQL_SERVER = "";
-$SQL_USER = "";
-$SQL_PW = "";
-$SQL_DB = "";
 
 // JSON
 $JSON_NAME = "../../tmp/mensaPlan.json";
diff --git a/panels/mensaPlan/getJson.php b/panels/mensaPlan/getJson.php
deleted file mode 100644
index 09d8f296faba3a5bb222d1aeabbf6fa8335d2762..0000000000000000000000000000000000000000
--- a/panels/mensaPlan/getJson.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$mysqli = new mysqli ( "ovanier.de", "info_reader", "7ELZqMyUwU8MaJba", "infoscreen" );
-
-if ($mysqli->connect_errno) {
-	printf ( "Connect failed: %s\n", $mysqli->connect_error );
-	exit ();
-}
-
-if ($result = $mysqli->query ( "SELECT * FROM City" )) {
-	
-	$result->close ();
-}
-
-$mysqli->close ();
-?>
\ No newline at end of file
diff --git a/panels/mensaPlan/helper.php b/panels/mensaPlan/helper.php
index febc7c98017ac247760ae235a158cee8a6358f90..8cab197c6fc0884ad5db71f5cd21666b0a60d4d3 100644
--- a/panels/mensaPlan/helper.php
+++ b/panels/mensaPlan/helper.php
@@ -20,26 +20,6 @@ function toJson($tage, $name, $inc_nr, $inc_original, $inc_short, $inc_art, $inc
 	$json .= "}";
 	file_put_contents ( $name, $json );
 }
-function toSql($tage, $server, $user, $pw, $db) {
-	$mysqli = new mysqli ( $server, $user, $pw, $db );
-	
-	if ($mysqli->connect_errno) {
-		printf ( "Connect failed: %s\n", $mysqli->connect_error );
-		exit ();
-	}
-	
-	$stmt = mysqli_prepare ( $mysqli, "INSERT INTO gerichte (nr,originalText,shortText,rind,schwein,gefluegel,fisch,vegetarisch,vegan,kinderteller,counter,date) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE originalText = ?,shortText = ?,rind = ?,schwein = ?,gefluegel = ?,fisch = ?,vegetarisch = ?,vegan = ?,kinderteller = ?, counter = ?" );
-	foreach ( $tage as $tag ) {
-		foreach ( $tag->getGerichte () as $gericht ) {
-			mysqli_stmt_bind_param ( $stmt, "issiiiiiiiisssiiiiiiii", $gericht->getNr (), $gericht->getOriginalText (), $gericht->getShortText (), $gericht->isRind (), $gericht->isSchwein (), $gericht->isGefluegel (), $gericht->isFisch (), $gericht->isVegetarisch (), $gericht->isVegan (), $gericht->isKinderteller (), $gericht->getCounter (), $gericht->getDate (), $gericht->getOriginalText (), $gericht->getShortText (), $gericht->isRind (), $gericht->isSchwein (), $gericht->isGefluegel (), $gericht->isFisch (), $gericht->isVegetarisch (), $gericht->isVegan (), $gericht->isKinderteller (), $gericht->getCounter () );
-			$gericht->getNr ();
-			$stmt->execute ();
-		}
-	}
-	$stmt->close ();
-	
-	$mysqli->close ();
-}
 function parsDay($html, $day) {
 	$tag = new TAG ( $day, substr ( $html->find ( 'a[href="#' . $day . '"]', 0 )->innertext, - 10, 10 ) );
 	
@@ -123,13 +103,14 @@ function parsDay($html, $day) {
 	return $tag;
 }
 function shortenText($text) {
-	$text = preg_replace ( '#\([\d+,]+\)#', '', $text ); // remove zusatzstoffe
+	$text = preg_replace ( '#\([^\)]*\)#', '', $text ); // remove zusatzstoffe
 	$text = preg_replace ( '#(\s,|,\s)#', ',', $text ); // fix Komma
 	$text = preg_replace ( '#,#', ', ', $text ); // fix Komma
 	$text = preg_replace ( '#\s+#', ' ', $text ); // fix double Whitespace
 	$text = preg_replace ( '#,\sdazu\s\d\sBeilagen\snach\sWahl#', '', $text ); // remove Beilagen
 	$text = preg_replace ( '#,\sdazu\s#', ' + ', $text ); // replace dazu
 	$text = preg_replace ( '#\sund\s#', ' & ', $text ); // replace und
+	$text = str_replace(' ;','; ',$text); //weniger hässlich
 	return $text;
 }
 
diff --git a/panels/mensaPlan/img/icon-aktionsteller.png b/panels/mensaPlan/img/icon-aktionsteller.png
deleted file mode 100644
index d61c641085ce29e017c8ed6da3dde5ef9ea56580..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-aktionsteller.png and /dev/null differ
diff --git a/panels/mensaPlan/img/icon-fisch.png b/panels/mensaPlan/img/icon-fisch.png
deleted file mode 100644
index dab150cbcc5b576e6ba08c983dd6e472239ded10..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-fisch.png and /dev/null differ
diff --git a/panels/mensaPlan/img/icon-grillstation.png b/panels/mensaPlan/img/icon-grillstation.png
deleted file mode 100644
index 9ba72be7872e348443d7dee49c50993541250319..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-grillstation.png and /dev/null differ
diff --git a/panels/mensaPlan/img/icon-menue-1.png b/panels/mensaPlan/img/icon-menue-1.png
deleted file mode 100644
index 2f02ad4dd081fcf6598745fa4f2449192b590846..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-menue-1.png and /dev/null differ
diff --git a/panels/mensaPlan/img/icon-menue-2.png b/panels/mensaPlan/img/icon-menue-2.png
deleted file mode 100644
index e918c9d018086e5903e884b1c62856a2265ba880..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-menue-2.png and /dev/null differ
diff --git a/panels/mensaPlan/img/icon-tagesgericht.png b/panels/mensaPlan/img/icon-tagesgericht.png
deleted file mode 100644
index 7021bfd384b7cf19f6bd8ae1796c206e6f13c9be..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-tagesgericht.png and /dev/null differ
diff --git a/panels/mensaPlan/img/icon-vegan.png b/panels/mensaPlan/img/icon-vegan.png
deleted file mode 100644
index 34cb48668356fbb6dd2d719080c6c1fb46bcc973..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-vegan.png and /dev/null differ
diff --git a/panels/mensaPlan/img/icon-vegetarisch.png b/panels/mensaPlan/img/icon-vegetarisch.png
deleted file mode 100644
index 773e847b59dd9733fac607701f2bfc69eb1552b8..0000000000000000000000000000000000000000
Binary files a/panels/mensaPlan/img/icon-vegetarisch.png and /dev/null differ
diff --git a/panels/mensaPlan/mensaParser.php b/panels/mensaPlan/mensaParser.php
index 295f169bea7382f49b65665f165141e59de6c359..9519dbfeb8c5691a3bf982d3ffd7724dc544ba3d 100644
--- a/panels/mensaPlan/mensaParser.php
+++ b/panels/mensaPlan/mensaParser.php
@@ -14,14 +14,7 @@ if ($html != null) {
 	}
 	
 	// CREATE JSON
-	if ($DO_JSON) {
-		toJson ( $tage, $JSON_NAME, $JSON_INC_NR, $JSON_INC_ORIGINAL, $JSON_INC_SHORT, $JSON_INC_ART, $JSON_INC_KIND, $JSON_INC_STOFFE, $JSON_INC_COUNTER, $JSON_INC_DATE );
-	}
-	
-	// SAVE
-	if ($DO_SQL) {
-		toSql ( $tage, $SQL_SERVER, $SQL_USER, $SQL_PW, $SQL_DB );
-	}
+	toJson ( $tage, $JSON_NAME, $JSON_INC_NR, $JSON_INC_ORIGINAL, $JSON_INC_SHORT, $JSON_INC_ART, $JSON_INC_KIND, $JSON_INC_STOFFE, $JSON_INC_COUNTER, $JSON_INC_DATE );
 } else {
 	echo "Webseite nicht erreichbar.";
 }
diff --git a/panels/mensaPlan/script.js b/panels/mensaPlan/script.js
index 2ca7c5acb40befb08b48d9a7d9039961a28e3985..a68ac408a278991b7f9f3dfdd21761ae7a10b91d 100755
--- a/panels/mensaPlan/script.js
+++ b/panels/mensaPlan/script.js
@@ -1,7 +1,9 @@
 this.tabtime=20;
+
 this.checkShowCondition = function() {
 	return 3*this.tabtime;
 }
+
 this.show = function() {
 	// switch tabs
 	this.interval=setInterval(function() {
@@ -25,6 +27,7 @@ this.show = function() {
 	}, this.tabtime*1000);
 
 }
+
 this.hide = function() {
 	clearInterval(this.interval);
 }
@@ -77,10 +80,10 @@ this.loaded = function(panel, config) {
 			break;
 		}
 		if (next) {
-			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von MORGEN dem  "
+			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von MORGEN, dem  "
 					+ day[0].date;
 		} else {
-			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von HEUTE dem  "
+			document.getElementById("mensaPlanTitleBar").innerHTML = "Mensaplan von HEUTE, dem  "
 					+ day[0].date;
 		}
 		var tableBody1 = document.getElementById("mensaPlanTable1Body");
@@ -133,83 +136,7 @@ this.loaded = function(panel, config) {
 				c++;
 			}
 			var cell1 = row.insertCell(0);
-			var cell2 = row.insertCell(1);
-			var cell3 = row.insertCell(2);
 			cell1.innerHTML = gericht.shortText;
-			var art = "";
-			var first = true;
-			if (gericht.rind) {
-				art += "R";
-			}
-			if (!first) {
-				art += " ";
-				first = false;
-			}
-			if (gericht.schwein) {
-				art += "S";
-			}
-			if (!first) {
-				art += " ";
-				first = false;
-			}
-			if (gericht.gefluegel) {
-				art += "G";
-			}
-			if (!first) {
-				art += " ";
-				first = false;
-			}
-			if (gericht.fisch) {
-				art += "F";
-			}
-			if (!first) {
-				art += " ";
-				first = false;
-			}
-			if (gericht.vegetarisch) {
-				art += "V";
-			}
-			if (!first) {
-				art += " ";
-				first = false;
-			}
-			if (gericht.vegan) {
-				art += "N";
-			}
-			cell2.innerHTML = art;
-			var img = "";
-			switch (gericht.counter) {
-			case 1:
-				img = "icon-menue-1.png";
-				break;
-			case 2:
-				img = "icon-menue-2.png";
-				break;
-			case 3:
-				img = "icon-tagesgericht.png";
-				break;
-			case 4:
-				img = "icon-vegetarisch.png";
-				break;
-			case 5:
-				img = "icon-aktionsteller.png";
-				break;
-			case 6:
-				img = "icon-grillstation.png";
-				break;
-			case 7:
-				img = "icon-fisch.png";
-				break;
-			case 8:
-				img = "icon-vegan.png";
-				break;
-			default:
-				img = "ERROR";
-			}
-			if (gericht.counter != 0) {
-				gericht.counter = cell3.innerHTML = '<img src="panels/mensaPlan/img/'
-						+ img + '" />';
-			}
 		}
 	}
 
diff --git a/panels/mensaPlan/setup/gerichte.sql b/panels/mensaPlan/setup/gerichte.sql
deleted file mode 100644
index b1ce28e1a46735045401df41043be49df9a19050..0000000000000000000000000000000000000000
--- a/panels/mensaPlan/setup/gerichte.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-CREATE TABLE IF NOT EXISTS `gerichte` (
-`id` int(255) NOT NULL,
-  `nr` int(11) NOT NULL,
-  `originalText` text NOT NULL,
-  `shortText` text NOT NULL,
-  `rind` tinyint(1) NOT NULL DEFAULT '0',
-  `schwein` tinyint(1) NOT NULL DEFAULT '0',
-  `gefluegel` tinyint(1) NOT NULL DEFAULT '0',
-  `fisch` tinyint(1) NOT NULL DEFAULT '0',
-  `vegetarisch` tinyint(1) NOT NULL DEFAULT '0',
-  `vegan` tinyint(1) NOT NULL DEFAULT '0',
-  `kinderteller` tinyint(1) NOT NULL DEFAULT '0',
-  `counter` int(11) DEFAULT '0',
-  `date` varchar(10) NOT NULL
-) ENGINE=InnoDB AUTO_INCREMENT=162 DEFAULT CHARSET=latin1;
-
-ALTER TABLE `gerichte`
- ADD PRIMARY KEY (`nr`,`date`), ADD UNIQUE KEY (`nr`,`date`), ADD KEY `id` (`id`);
\ No newline at end of file
diff --git a/panels/mensaPlan/setup/zusatzstoffe.sql b/panels/mensaPlan/setup/zusatzstoffe.sql
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/panels/topListe/getTasks.php b/panels/topListe/getTasks.php
deleted file mode 100644
index dc10d563346f39f58a736ed6bf9960cb11622d4e..0000000000000000000000000000000000000000
--- a/panels/topListe/getTasks.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-
-?>
\ No newline at end of file
diff --git a/panels/topListe/script.js b/panels/topListe/script.js
deleted file mode 100644
index db799dcdcf59623ab0319c9219b0bb8debca1d9c..0000000000000000000000000000000000000000
--- a/panels/topListe/script.js
+++ /dev/null
@@ -1,39 +0,0 @@
-this.loaded = function(panel, config) {
-	addElement("A");
-	addElement("B");
-	addElement("C");
-	addElement("D");
-	addElement("E");
-	//removeElement(3);
-	moveElement(3,1);
-}
-
-var lastUpdates;
-
-function pull(){
-	
-}
-
-function addElement($text){
-	var $li = $("<li class='ui-state-default'/>").text($text);
-	$("#topListSortable").append($li);
-	$("#topListSortable").sortable();
-	$("#topListSortable").disableSelection();
-	$("#topListSortable").sortable('refresh');
-}
-
-function moveElement($idO,$idN){
-	if($idO != $idN) {
-		if($idO < $idN){
-			$("#topListSortable li:eq("+$idO+")").insertAfter($("#topListSortable li:eq("+$idN+")"));
-		} else {
-			$("#topListSortable li:eq("+$idO+")").insertBefore($("#topListSortable li:eq("+$idN+")"));
-		}
-		$("#topListSortable").sortable('refresh');
-	}
-}
-
-function removeElement($id){
-	$("#topListSortable li:eq(" + $id+")").remove();
-	$("#topListSortable").sortable('refresh');
-}
\ No newline at end of file
diff --git a/panels/topListe/style.less b/panels/topListe/style.less
deleted file mode 100644
index 8aa83bfc3490366bd70d5c75b48820fb6254923d..0000000000000000000000000000000000000000
--- a/panels/topListe/style.less
+++ /dev/null
@@ -1,45 +0,0 @@
-#topListe{
-	position:relative;
-	width:100%;
-	height:100%;
-}
-
-#currentTop {
-	background-color: #ffffff;
-	float:left;
-	position:relative;
-	top:0;
-	width: 100%;
-	height: 25%;
-}
-
-#topName{
-	float: left;
-	background-color: #ffffff;
-	width: 100%;
-	height: 25%;
-	font-size: 300%;
-	text-align: center;
-}
-
-#topDescription{
-	float: left;
-	background-color: #ffffff;
-	width: 100%;
-	height: 25%;
-	font-size: 200%;
-}
-
-#topListAnzeige{
-	float: left;
-	width: 100%;
-	height: 25%;
-}
-
-#topListSortable {
-	font-weight: bold;
-	color: #ffffff;
-	list-style-type: decimal;
-	font-size: 200%;
-	float:left;
-}
diff --git a/panels/topListe/template.html b/panels/topListe/template.html
deleted file mode 100644
index f261b32c9f4f401fbad467206dd76fa99a5c758b..0000000000000000000000000000000000000000
--- a/panels/topListe/template.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="topListe">
-	<div id="currentTop">
-		<div id="topName">
-			TEST1
-		</div>
-		<div id="topDescription">
-			TEST2
-		</div>
-	</div>
-	<div id="topListAnzeige">
-		<ol id="topListSortable">
-		</ol>
-	</div>
-</div>
-
diff --git a/panels/topListe/tops.json b/panels/topListe/tops.json
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/panels/werbung/img/Grillen2016_0.png b/panels/werbung/img/Grillen2016_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b6d3c3e54daa961e2b68c54e08eb75d1dbf9e05
Binary files /dev/null and b/panels/werbung/img/Grillen2016_0.png differ
diff --git a/panels/werbung/img/itour2016_0.png b/panels/werbung/img/itour2016_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..f65a36ac418863ba216c9fc3adeb262cf1110142
Binary files /dev/null and b/panels/werbung/img/itour2016_0.png differ
diff --git a/panels/werbung/img/ophase_party_1617.jpg b/panels/werbung/img/ophase_party_1617.jpg
deleted file mode 100644
index 9cbf077c07ac57b5fa77d36308c2b8e2cb057e92..0000000000000000000000000000000000000000
Binary files a/panels/werbung/img/ophase_party_1617.jpg and /dev/null differ
diff --git a/panels/werbung/script.js b/panels/werbung/script.js
index 9845c126e4b79072c1af6c800b28e7982707567f..8cfbca1b253a2815365f3128bd29c7b28dcda915 100644
--- a/panels/werbung/script.js
+++ b/panels/werbung/script.js
@@ -1,16 +1,27 @@
-var lastWerbung=0;
-var werbung = null;
+var nextWerbung=0;
+var werbung_config = null;
 var werbung_img_display = null;
+var werbung_panel = null;
 this.loaded=function(panel,config) {
-	$(panel).find("#werbung_display").attr("src", "panels/werbung/img/"+config);
+	werbung_panel = panel;
+	werbung_config = config
 }
 
 this.show=function() {
+	$(werbung_panel).find("#werbung_display").attr("src", "panels/werbung/img/"+werbung_config.files[nextWerbung].filename);
+	if(nextWerbung+1<werbung_config.files.length) {
+		nextWerbung += 1; 
+	} else {
+		nextWerbung = 0;
+	}
 }
 
 this.resize=function() {
 }
 
-this.checkShowCondition=function() {
-    return 0;
+this.hide = function() {
+}
+
+this.checkShowCondition = function() {
+	return 20;
 }