Fixed bugs in example db.
Merge branch 'dev'