Again
Merge remote-tracking branch 'origin/master' into SagieBranch

Conflicts:
	IceCaveProject/src/com/tas/icecave/gui/LoadingScreen.java