change mailaddress to FFNRW
Merge remote-tracking branch 'origin/master' into fflev
change url to FFNRW
Merge remote-tracking branch 'origin/master' into fflev