Add back Clock Options

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/prefs_statusbar_clock.xml
	src/com/aokp/romcontrol/fragments/StatusBarClock.java
LCD density wizard now also clears gms and gsf

plus added 213 (nexus7) to the stock values
Conflicts:
	res/values/strings.xml
	res/xml/lcd_density_setup.xml
	src/com/android/settings/carbon/DensityChanger.java
Update.

Update again.
Merge branch 'jb2' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2
Fix FC.