Merge origin/master

Conflicts:
	src/Presentation/Components/ListPanel.java
Merge origin/master