deprecated more unused methods
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main
minor merge error
implemented null layout for neater view, but now we cannot resize the window.