Dev database

@ahmedhagii  @AhmedElassuty  
Issues #412 #413