Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 0 insertions, 34 deletions

diff --git a/data/templates/bottom.inc.php b/data/templates/bottom.inc.php
deleted file mode 100644
index 0c966a2..0000000
--- a/data/templates/bottom.inc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--following code is generated by templates/bottom.inc.php-->
-<div id="bottom">
-<?php echo $GLOBALS['footerMessage'].' ';?>
-<?php
-echo '<a href="'.createURL('about').'">'.T_('About').'</a>';
-echo ' - ';
-echo T_("Propulsed by ");
-echo " <a href=\"https://sourceforge.net/projects/semanticscuttle/\">SemanticScuttle</a>";
-
-if($GLOBALS['enableWebsiteThumbnails']) {
-	// Licence to the thumbnails provider (OBLIGATORY IF YOU USE ARTVIPER SERVICE)
-	echo ' (Thumbnails by <script type="text/ecmascript" src="http://www.artviper.net/link.js"></script>)';
-}
-?>
-
-</div>
-
-
-<?php if(isset($GLOBALS['googleAnalyticsCode']) && $GLOBALS['googleAnalyticsCode']!= ''):?>
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("<?php echo $GLOBALS['googleAnalyticsCode']?>");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-
-<?php endif;?>
-
-</body>
-</html>