nnr
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/it/unical/mat/igpe/graphics/CenterGamePanel.java