fixed conflicts with master
[meabook] / database / __init__.py