change time dialog
merge git pull! dajee