Revert "Changes for CA"

This reverts commit 0791cfeb6b10af9e1bbc33ade0d453b1501620cb.

Conflicts:
	src/com/carbon/fibers/SettingsActivity.java