database updates
Merge branch 'master' of https://github.com/utwente-di/di04

Conflicts:
	kunstmenu/src/main/java/nl/utwente/di04/servlets/AddActivityServlet.java
database