kleine "Design" Fehler ausgemerzt
Merge pull request #89 from Alabamajack/master

kleine "Design" Fehler ausgemerzt
-.-
Merge pull request #90 from Alabamajack/master

-.-
finish sufu
Merge commit '2acb98b60a143e9af67a5a83db5fb072e6753ee6'

Conflicts:
	Site/de/content/search.html
	Site/de/location.php
	Site/de/search.php
	Site/layout/header.php
	Site/layout/jquery.dataTables.css
fix merge conflicts
Fixes, fixes, fixes #2
Merge pull request #92 from IOIOI/master

Fixes, fixes, fixes #2
Merge remote-tracking branch 'Upstream/master'