Added option to choose between 12-hours or 24-hours time format in chat
Merge from 24hours