Reading from XML. M-tree integration. DBSCAN calibration.
conflicts deleted
21/5 changes
26-05-a
Merge Tobias and Kostas changes
Updates to the kernal.
conflicts merged 2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AwesomeCBR/bin/cbr/Kernel.class
	AwesomeCBR/bin/core/CBRProject.class
	AwesomeCBR/bin/gui/AwesomeCBR$1.class
	AwesomeCBR/bin/gui/AwesomeCBR$2.class
	AwesomeCBR/bin/gui/AwesomeCBR$3.class
	AwesomeCBR/bin/gui/AwesomeCBR$4.class
	AwesomeCBR/bin/gui/AwesomeCBR.class
	AwesomeCBR/bin/gui/CBRProject_View_JPanel.class
	AwesomeCBR/src/cbr/Kernel.java
	AwesomeCBR/src/gui/AwesomeCBR.java
	AwesomeCBR/src/gui/CBRProject_View_JPanel.java
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AwesomeCBR/src/gui/CBRProject_View_JPanel.java
kernel conflict resolved
my shit for today
Merge remote-tracking branch 'kostas/master'

Conflicts:
	AwesomeCBR/src/gui/CBRProject_View.java
unimportant commit
Final