Merge pull request #249 from cs2103aug2014-w13-1c/jin/gui

Refactoring based on IntelliJ static analysis
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
collated test files under src/tests