QuickSettings : Use stock layouts / fix userTile

Switch over to using 2 layouts (one generic, one user tile),
just like how aosp does it. This way the tiles look similar to
their SystemUI counter part.

Change-Id: I8640c99602b056fb48b37f516c23c16555a2ba2a
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

Conflicts:
	src/com/android/settings/cyanogenmod/QuickSettingsUtil.java

Change-Id: I2bc07e54e961b49d79b5fc24c289b94f3b4f9d36
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7