solve the GUI cannot display error
Merge branches 'master', 'master' and 'master' of https://github.com/cs2103aug2014-w09-2j/main