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

Change-Id: I95afd0e110f3e7b0a3f10ea2212aa4272fa8844e