Pull Request : Dev database

@ahmedhagii @AhmedElassuty
plz merge
Issues #484 #496