db and user entity
Merge remote-tracking branch 'origin/akshat'