Lockscreen shortcuts: Fix icon pack usage

Change-Id: I1497cece97f90c76c3930a3a004a2d40416e13ed
Settings: Add some more entries into 'SMS message limit' menu

Add None, 5 and 10 entries into 'SMS message limit' menu.

Change-Id: I8b206ae6c9f73378da65b09e68898de31439cc59
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Quiet Hours: Allow disabling phone ringer (2/3)

Change-Id: Ica45cded1b70af36f9e0efdc5ec6911a138e0551
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_arrays.xml

Change-Id: I44050dd9d2b8f9ce4731c797f2a8ff00d3e9ba34
Settings: DE translation for new quiet hours ringer settings

Change-Id: I3b0066da90641c52091c708ff033f1602f4c4e3c
Settings: remove unused Quiet Hours string from translations

ps2: Cid is being weird...

Change-Id: I707e991a463e1ffa2a5b351b1d20deb47a10f869
Merge "Settings: Add some more entries into 'SMS message limit' menu" into cm-11.0
Merge "Settings: remove unused Quiet Hours string from translations" into cm-11.0
Merge "Settings: DE translation for new quiet hours ringer settings" into cm-11.0
Merge "Lockscreen shortcuts: Fix icon pack usage" into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge branch 'sgt7/cm-11.0'