#228 wrong include files
Tidy comments/whitespace
update
Merge https://github.com/fisharebest/webtrees