Make menu in launcher optional

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

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