database fix
Merge branch 'master' of https://github.com/vu-son-mulodo/demo-ror