singleton dao implementation removed
code and tests updated
Merge remote-tracking branch 'origin/master'