Fixing errors on the build, and timestamp changes to EvebtDoa
Merge remote-tracking branch 'origin/master'
Error correction, timestamp changes for Event Dao