fix conflicts
Merge branch 'master' of https://github.com/toray/torayUtils-lib
Merge branch 'master' of https://github.com/toray/torayUtils-lib
fix time method
Merge branch 'master' of https://github.com/toray/torayUtils-lib