flobb
Merge remote-tracking branch 'origin/master'

Conflicts:
	desktop/src/com/xikka/spaceheist/desktop/DesktopLauncher.java