Merge branch 'JacpFX8'
Merge remote-tracking branch 'origin/master'
fixed main.xml