ventanas config tecnica
Merge branch 'master' of https://github.com/nachovz/FML.git

Conflicts:
	FuzzyMiningLab/src/ve/com/fml/view/DefineFuzzySetsWindow.java
	FuzzyMiningLab/src/ve/com/fml/view/EditAprioriWindow.java
	FuzzyMiningLab/src/ve/com/fml/view/EditDTWindow.java
	FuzzyMiningLab/src/ve/com/fml/view/EditKMeansWindow.java
	FuzzyMiningLab/src/ve/com/fml/view/EditKNNWindow.java