Merge of gui8 to Master

Binary differences in the controlsfx.jar file