Updated Database -- again
Merge branch 'master' of https://github.com/arbox/ldv-projektseminar-2012
Updated Database -- again