Merge "Propely restore the vibration settings" into kk
Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/com/carbon/fibers/fragments/ui/RamBar.java