ChangeActivity servlet
Change activity done
ChangeActivity
Merge branch 'master' of https://github.com/utwente-di/di04

Conflicts:
	kunstmenu/src/main/java/nl/utwente/di04/database/HibernateUtils.java
	kunstmenu/src/main/webapp/AddActivity.jsp
	kunstmenu/src/main/webapp/index.jsp