Merge origin/newTomoee into YetAnothoerBranch

Conflicts:
	src/presentation/CasablancaFacilities.java