Updated collate files.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Fixed the notifications problem.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Update names for integration tests.
Fix merge conflicts.
IntegrationTest messages for 0 and 5.