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
Update.

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