clean ui main
Merge branch 'master' of https://github.com/maLestrade/BioVegProject.git

Conflicts:
	BioVegProject/src/main/java/ui/Main.java