Dev database

@ahmedhagii @AhmedElassuty 

 #412 #413 #415 #418 #419  #426 #431 #432