Fix Charger Control

Conflicts:
	DeviceSettings/src/com/cyanogenmod/settings/device/USBFragmentActivity.java
	DeviceSettings/src/com/teamcanjica/settings/device/DeviceSettings.java
	rootdir/init.samsungjanice.rc

Change-Id: I869f225ab66f2fc2cd2c7c3083344ffc2b753d35