Fix fc on button activity

Conflicts:
	res/xml/button_settings.xml
Nitpick Rick (clean up)

Conflicts:
	src/com/carbon/settings/fragments/navbar/NavigationRingTargets.java
	src/com/carbon/settings/fragments/navbar/NavigationTargets.java
	src/com/crom/settings/fragments/navbar/NavigationRingTargets.java