Updated my homepage and set copyright statements to fruux.
Merge branch '1.7' into 1.8
Resolved all conflicts again.