UI improved.
Merge branch 'master' of https://github.com/CS2103TAug2014-W15-4J/main

Conflicts:
	src/view/MainViewController.java