Boat und LogBook erweitert
Boat
Boat und LogBook
Merge branch 'master' of https://github.com/Airwaver/SeaPal

Conflicts:

SeaPal/templates_c/0f08e2546aab4282cfef6b12279ef9bd24618a7d.file.footer.
html.php

SeaPal/templates_c/73293cdb729812fdb37a8f5d7822cc318e944846.file.Contact
.html.php