Port Slim Date Format Option (2/2)

Change-Id: I6a1b3e09d905ae92b9500382c88a3d68bb54cf90

Conflicts:
	res/values/strings.xml
	src/com/aokp/romcontrol/fragments/StatusBarClock.java
Merge remote-tracking branch 'rootbox/jb-mr1' into HEAD

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml