Re-add profiles UI.

Change-Id: I8abfa71dcc0f8a3889922b70d27c941fc8d0ac70

Also: Added some minor Tentacles changes

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_menu_add.png
	res/drawable-xhdpi/ic_menu_add.png
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/styles.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/Utils.java