Derp fixes

Conflicts:
	src/com/crom/settings/device/DeviceStartup.java