time format change
merged Ahmad's changes to newDatabase branch to master