Catching up with changes
Merge branch 'master' of https://github.com/keyaral/SwenProject.git

Conflicts:
	KPSmart/src/Logic/EventProcesser.java
Made events be loaded