diff --git a/.gitmodules b/.gitmodules
index 854b38f5..71019fe5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "extensions/feeds"]
 	path = extensions/feeds
 	url = git://github.com/AKSW/feeds.ontowiki.git
+[submodule "Thesisannouncements"]
+	path = Thesisannouncements
+	url = https://github.com/AKSW/googledoc-viewer.git
diff --git a/.htaccess b/.htaccess
index 13ba44f2..46134378 100644
--- a/.htaccess
+++ b/.htaccess
@@ -30,6 +30,7 @@
     # do not rewrite requests on /robots.txt or /maintenance.html
     RewriteCond %{REQUEST_URI} !/(robots.txt|maintenance.html|google1dee60de22057204.html|dataid.ttl)$
     RewriteCond %{REQUEST_URI} !/BibsonomyProxy/.*$
+    RewriteCond %{REQUEST_URI} !/Thesisannouncements/.*$
     # do not rewrite requests on resource under public in extensions
     RewriteCond %{REQUEST_URI} !/extensions/.*/public/.*$
 
@@ -75,4 +76,3 @@
 # this files parses the config ini generates the cache id and directly
 # looks for the object cache and outputs it
 #php_value auto_prepend_file './extensions/site/FastCacheLoad.php'
-
diff --git a/Thesisannouncements b/Thesisannouncements
new file mode 160000
index 00000000..68a75bda
--- /dev/null
+++ b/Thesisannouncements
@@ -0,0 +1 @@
+Subproject commit 68a75bdae86bf9f6810e062f1c46fd4bdbb0a28c
diff --git a/site/items/thesisannouncements.phtml b/site/items/thesisannouncements.phtml
new file mode 100644
index 00000000..03d1c523
--- /dev/null
+++ b/site/items/thesisannouncements.phtml
@@ -0,0 +1,66 @@
+<?php
+/**
+ * This file is part of the {@link http://ontowiki.net OntoWiki} project.
+ *
+ * @copyright Copyright (c) 2015, {@link http://aksw.org AKSW}
+ * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
+/**
+ * aksw.org supervison template
+ *
+ * this template renders a resources thesis supervisons
+ */
+
+$baseUrl = 'http://aksw.org/Thesisannouncements';
+
+$supervisorTag   = $this->literal(array(
+    'property' => 'aksw:supervisorTag',
+    'plain' => true
+));
+$templateOptions = $this->literal(array(
+    'property' => 'site:templateOption',
+    'array' => 'true'
+));
+if (
+    (isset($supervisorTag) && !empty($supervisorTag)) ||
+    (isset($this->options['enabled']) && $this->options['enabled'])
+) :
+?>
+
+<?php if (in_array('noheading', $templateOptions) === false) : ?>
+<h1>Thesis and Essay Proposals</h1>
+<?php endif; ?>
+
+<div id="thesisproposal_filter"></div>
+
+<div id="thesisproposal_reply"></div>
+
+<script src="<?= $baseUrl ?>/formhandler.js"></script>
+<script type="text/javascript">
+
+    var endpoint = '<?= $baseUrl ?>/requestHandler.php';
+    var id = 'thesisproposal_filter';
+    var replyId = 'thesisproposal_reply';
+
+    var labels = {
+        "Sorry, no topic matched your criteria." : "Sorry, no topic matched your criteria.",
+        "status":"Status",
+        "type": "Type",
+        "bachelorThesis": "Bachelor Thesis",
+        "masterThesis": "Master Thesis",
+        "project": "Project",
+        "dissertation": "Dissertation"
+    };
+
+    var selector;
+    <?php if (isset($supervisorTag) && !empty($supervisorTag)): ?>
+    //if ($this->property("rdf:type") == "foaf:Person")
+    selector = {"supervisor" :"<?= $supervisorTag ?>"};
+    <?php endif; ?>
+
+    $(document).ready(function(){
+        showform(endpoint,id,replyId,labels,selector);
+    });
+</script>
+<?php endif; ?>
diff --git a/site/types/person.phtml b/site/types/person.phtml
index 32853cd3..126be23c 100644
--- a/site/types/person.phtml
+++ b/site/types/person.phtml
@@ -89,7 +89,10 @@ $buttons = $this->querylist($queryForButtons, 'local/items/buttons.phtml');
 
 <?php echo $this->literal(array('tag' => 'div', 'class' => 'content')) ?>
 <?php echo $currentProjects, $pastProjects; ?>
-<?php echo $this->renderx(array(
+<?php
+echo $this->renderx(array(
+    'template' => 'local/items/thesisannouncements.phtml'
+));
+echo $this->renderx(array(
     'template' => 'local/items/publications.phtml'
 ));
-
diff --git a/site/types/teaching.phtml b/site/types/teaching.phtml
new file mode 100644
index 00000000..4025422f
--- /dev/null
+++ b/site/types/teaching.phtml
@@ -0,0 +1,51 @@
+<?php
+/**
+ * This file is part of the {@link http://ontowiki.net OntoWiki} project.
+ *
+ * @copyright Copyright (c) 2011, {@link http://aksw.org AKSW}
+ * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
+ */
+
+/**
+ * aksw.org project template
+ *
+ * arranges the content for the project class
+ */
+
+// prepare hookline and abstract (both optional)
+// yes, hookline also for documents please :-)
+$hookline = $this->literal(array(
+    'property' => 'aksw:hookline',
+    'class' => 'hookline',
+    'prefix' => '<span class="hideme">:</span> '
+));
+$abstract = $this->literal(array(
+    'property' => 'dcterms:abstract',
+    'tag' => 'p',
+    'class' => 'abstract'
+));
+
+// create optional side navigation
+$sideNavigation = $this->navigationList(
+    array(
+        'navProperty' => 'http://aksw.org/schema/sideNavigation',
+        'navClass' => 'nav-sidelinks',
+        'suffix'    => '<!-- /#nav-sidelinks -->',
+        'activeUrl' => $this->resourceUri
+    )
+);
+echo $sideNavigation;
+?>
+<header class="intro">
+    <h1><?php echo $this->title . $hookline ?></h1>
+    <?php echo $abstract ?>
+</header> <!-- /.intro -->
+<?php
+echo $this->literal(array('tag' => 'div', 'class' => 'content')); // uses default content properties
+echo $this->renderx(array(
+    'template' => 'local/items/thesisannouncements.phtml',
+    'enabled' => true
+));
+echo $this->renderx(array(
+    'template' => 'local/items/publications.phtml'
+));