getting ready for merge
Merge branch 'javafx' into submodules-fix