splash plus other ui issues fixed
Merge remote branch 'origin/master'

Conflicts:
	src/gui/popup/ProductOnDisplayPopup.java