solve some timer issues
Merge branch 'master' of https://github.com/cs2103aug2014-t17-2J/main