Settings: Make it clear that the Lock clock is also a Home widget

Also includes some whitespace cleanup

Change-Id: I446409f3ace482d8321803752d93bd90d9dc5f2c
Settings: Introducing 'Chronus'

Change-Id: Iae59aa31106178bccf170ba693ee888025a4ef0f
Remove or rename duplicate strings

Change-Id: Ib955072f33385ca67081c2bbc589b062cae01a0d
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD