Update "events"-table
Merge branch 'master' of https://github.com/Distribuerede-systemer/server

Conflicts:
	src/model/Model.java
Merge branch 'master' of https://github.com/Distribuerede-systemer/server