mail part is back again.
Merge origin/MakingGuestIdWork

Conflicts:
	src/domain/Controller.java
trying to merge full ot master
Merge origin/master into news

Conflicts:
	src/dataSource/DBFacade.java
	src/domain/Controller.java