Update display formatter
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main

Conflicts:
	.settings/org.eclipse.jdt.core.prefs