Removed unnecessary code.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/view/MainPanel.java