AddActivity ready to Hibernate!!
Pre rebase commit
Merge
Merge
Pre rebase commit
Activity for Yuri
Merge nog een keer
aLLES WERKT WEER!!!
almost there
HIJ WERKT:D
Added apropriete names
Merge remote-tracking branch 'origin/master' into add-show
Fixing conflicts

Conflicts:
	kunstmenu/pom.xml
	kunstmenu/src/main/webapp/WEB-INF/web.xml
	kunstmenu/src/test/java/nl/utwente/di04/TestAddActivity.java