fix timer bug
Merge branch 'master' of https://github.com/mYmNeo/Gaea