separated timed tasks and FloatingTasks
Merge branch 'master' of https://github.com/cs2103aug2014-t16-4j/main