MainViewController Refactor
Merge branch 'master' of https://github.com/cs2103aug2014-w15-2j/main

Conflicts:
	src/userInterface/MainViewController.java
Merge branch 'master' of https://github.com/cs2103aug2014-w15-2j/main