General: added collate comments
Merge branch 'master' of https://github.com/cs2103aug2014-f09-1j/main.git
GUITest: adjusted to fit new feedback
Merge branch 'master' of https://github.com/cs2103aug2014-f09-1j/main.git