"TestWizard view"
Merge branch 'master' of https://github.com/apic6/MELT

Conflicts:
	src/Viewer/Welcome.java