database
Finished Database+test
merge databaseconnectivity
Added web.xml for at least GetActivity servlet
TestDatabase
Merge branch 'master' of https://github.com/utwente-di/di04
Merge branch 'databaseconnectivity'

Conflicts:
	kunstmenu/src/test/java/nl/utwente/di04/test/TestDatabase.java
Merge branch 'master' of https://github.com/utwente-di/di04
database classes generated by hibernate
fixed FKs in annotations
finished hibernate stuff
Merge
Merge
Pre rebase commit
Activity for Yuri
Merge nog een keer