Added: bug fix in time conversion and format
Merge branch 'master' of https://github.com/vinhnghi223/ZI2014-Nghi