Allow other users to modify button settings

Change-Id: Id3b16f3fa3f1e7a8eaef42cfdc12e93dff3fed9b
Merge "Allow other users to modify button settings" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	res/xml/settings_headers.xml

Change-Id: I28320f81298496a39ced9e5c477dc31d555daf5c
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2-sgt7