Worken on HistoryPanel
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/view/HistoryPanel.java