Updated time

Updated the time so that it was more close to now.
Merge branch 'fix/update-time' into develop
Merge branch 'develop'