Conflicts:
	README
	css/_admin.css
	css/_diff.css
	css/_edit.css
	css/_footnotes.css
	css/_forms.css
	css/_imgdetail.css
	css/_links.css
	css/_modal.css
	css/_recent.css
	css/_search.css
	css/_toc.css
	css/basic.css
	css/content.css
	css/design.css
	css/includes.css
	css/print.css
	css/rtl.css
	css/structure.css
	detail.php
	images/bullet.png
	images/closed.png
	images/favicon.ico
	images/link_icon.gif
	images/mail_icon.gif
	images/open.png
	images/windows.gif
	main.php
	mediamanager.php
	style.ini
	tpl_functions.php

added includes for sidebar header and footer (closes #41) and moved page header and footer inside .page div

minor fix (initialize variable)

otherwise it won't be filled

fixed logo size setting (fixes #36) and fix media queries for more modern smartphones (hopefully)

(with large resolutions)

changed logo to use new tpl_getMediaFile() and exchanged fixed image dimensions with calculated ones (fixes #25)