dbunit sample-data.xml clean-up
Merge remote-tracking branch 'origin/master'