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