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

DeviceSettings update
DeviceSettings: Fix charge cycle control directory

Conflicts:
	rootdir/init.samsungjanice.rc
DeviceSettings: Try to fix charge cycle FC on startup
java.lang.ClassCastException: java.lang.Integer cannot be cast to java.lang.String
Fix Disable GPU fullspeed name
DeviceSettings: Add about activity and settings activity
DeviceSettings: Fix previous commit
DeviceSettings: Add up navigation and simplify fix
DeviceSettings: Fix startup restore
DeviceSettings: Missing import

Please whatch out on this, you lost it last time too ...