Clock Custom Date

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/xml/status_bar.xml
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: Id084e3a26989cf15d8ef2264cd0d23c2e5533ee6
Fix Clock Settings Derp

Change-Id: I94eea2ae8107b174619b88d404fa88ab5e060950