Integrate Controller into UI
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main.git
Main driver