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.
Merge pull request #271 from cs2103aug2014-w13-1c/ryan/controller

Fixed error messages & rearranged ActionController
Fix merge conflicts.
IntegrationTest messages for 0 and 5.
Merge branch 'staging' into ryan/controller