DB_time fix
DB_time fix 2
Merge branch 'master' of https://github.com/webdesigner97/collabportal