Fixed comment
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui
Removed extra imports.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Added done/undone integration test
Added integration test 0
LoggingServiceTest now passes its tests FOREVER.
Removed unused code
Merge pull request #264 from cs2103aug2014-w13-1c/jin/gui

Some integration tests
Updated .gitignore
Merge branch 'staging' into ryan/controller
Merge pull request #265 from cs2103aug2014-w13-1c/ryan/controller

Edited .gitignore
Fixed bug on return message for sort
Merge pull request #266 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug on return message for sort
comment for inputfieldviewmanager
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui