Merged from php_branch (master)
 - css
 - boat update
 - button-hiding
 - map

Signed-off-by: Felix <felix.herz@hotmail.de>