Improved the GUI layout for the simulation window.
Merge remote-tracking branch 'origin/master'

Conflicts:
	damSim/display/ImagePanelDisplay.java