DBhandler Completed
Merge branch 'ran' into shai
s