Fixed Options screen
Merge branch 'master' of https://github.com/ayrten-cofounder/Ayrten-Scrots

Conflicts:
	desktop/src/com/ayrten/scrots/desktop/DesktopLauncher.java