Merge branch 'staging' into dat/model
Merge pull request #177 from cs2103aug2014-w13-1c/jin/gui

Made the tick smaller
Merge pull request #178 from cs2103aug2014-w13-1c/jin/gui

Made the tick even smaller
Merge branch 'staging' into dat/model
ModelManager method to get file directory.
loadTodoItems implemented in ModelManager. See model.md
Merge remote-tracking branch 'origin/staging' into jolly/gui