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 branch 'cm-10.1' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.1

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

Change-Id: I87b9033bb051783e74a81bc704717d34870d51c4