Merge pull request #23 from t4n017/cm-11.0-pull

Fix sweep2wake file path + DeviceSettings update
DeviceSettings: Add missing permissions
DeviceSettings: Organise
The weightage of settings in each category should be more equal now

- Moved WIFI PM mode to Network
- Changed Powermgmtfragment to IOfragment, moved IO related settings to the fragment

Conflicts:
	DeviceSettings/res/values/strings.xml
	DeviceSettings/res/xml/advanced_preferences.xml
	DeviceSettings/src/com/teamcanjica/settings/device/fragments/AdvancedFragmentActivity.java
	DeviceSettings/src/com/teamcanjica/settings/device/fragments/IOFragmentActivity.java
	DeviceSettings/src/com/teamcanjica/settings/device/fragments/NetworkFragmentActivity.java
DeviceSettings: Add initial CPU UV (should work)

Also:
-Merged seekbars into one
-Use else ifs to possibly reduce excessive if checking

Conflicts:
	DeviceSettings/src/com/teamcanjica/settings/device/CustomSeekBarDialogPreference.java
	DeviceSettings/src/com/teamcanjica/settings/device/fragments/AdvancedFragmentActivity.java
DeviceSettings: UV: Fixess
DeviceSettings: CPU UV: Last fixes (confirmed working)
init: Add missing permissions
DeviceSettings: Fix UnderVolt options FC

Casting Integer to String
DeviceSettings: Add Cycle Charging Control

-Fix error in MasterSeekBarDialogPreference.java
-Organise settings a bit

Conflicts:
	DeviceSettings/res/xml/advanced_preferences.xml
	rootdir/init.samsungjanice.rc