Javafx libraries
Merge origin/master