Allow other users to modify button settings

Change-Id: Id3b16f3fa3f1e7a8eaef42cfdc12e93dff3fed9b
Merge "Allow other users to modify button settings" into cm-10.2
NFC polling mode (2/3)

Change-Id: Ic46ede10fa91f02ca73daa12aa60098c8a52ceef

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java