add DB Adapter
fix merge
Merge branch 'master' of https://github.com/masp/mapquiz
update db