Changed TIMESTAMP to DATETIME in database setup to change behaviour of updates.
Merge remote-tracking branch 'origin/Semi-final' into Semi-final