Test values
Merge branch 'master' of https://github.com/keyaral/SwenProject.git

Conflicts:
	KPSmart/file.xml
Merge branch 'master' of https://github.com/keyaral/SwenProject.git

Conflicts:
	KPSmart/file.xml
	KPSmart/src/Logic/EventProcesser.java
Merge branch 'master' of https://github.com/keyaral/SwenProject.git
Resolved Conflict with Alex code all up to date
Merge remote-tracking branch 'origin/master'

Conflicts:
	KPSmart/file.xml
	KPSmart/src/Log/event/EventLogManager.java
	KPSmart/src/gui/CostModification.java
	KPSmart/src/gui/MailDelivery.java
Fixed updating all changes
Realligning with Github