Updating time format function
Merge branch 'master' of 192.168.1.69:fw