removed usage of javafx.util.Pair, replaced it with self made Pair class.
Merge remote-tracking branch 'origin/master'