Revert "Hide the AM/PM preference completely if using a 24-hour clock"

This reverts commit d1f1fb4064bfcef528a12a4c5176df7b44ffd48c.
Revert "Forward port Status Bar settings"

This reverts commit c0973892366407ad5b4129ddd59530f098673dce.

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/status_bar.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
(11) Initial Statusbar push

basic functions fit to frameworks base initial Statusbar push

add to Slim interfacesettings

Change-Id: I85e6df95ab849b750047f3ceb739172bca6ad069

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
[Settings] Add clock styles and Clock color picker (2/2)

This commit is a combination of CM AOKP and SLIMROMS work

features:

- Clock and date enable/disable
- Clock and date position
- AM/PM styles multilang support
- Fully customizable date in style and format
- Fully dynamic settings

Change-Id: If4d648d2af182ea7d13f4757433564e1b2ab6a50

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
[Settings] Port BatteryBar (1/2)

- Adds Battery bar with following features
- location set
- color
- aligment
- thickness
- animation

- dynamic slim settings

Change-Id: I225afbec1091adea1b8ee79ad04080537e100246

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
[Settings] Clock standard value differ

to stock value on fresh install.....now same
Status bar brightness control from CM10 (2/2)

Patchset2+3 cleanup

Change-Id: I9d352635fce4dd045ac227c93220c15c74e38175

Conflicts:
	res/values/strings.xml