GUI: structural changes so GUI types are easily interchangeable
Merge branch 'master' of https://github.com/cs2103aug2014-f09-1j/main.git