DB changes
Merge branch 'master' of https://github.com/nromanen/Ch-025