changed database design, added test data
Merge branch 'Sophie'