Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GUI/EventList.java
EventList class added to the project
Merge branch 'master' of https://github.com/Distribuerede-systemer/server