Settings: Fix apostrophes

Change-Id: Icea8b908d786fa1586ab5dde35aae7dc67746568
Settings: Add preference for EdgeGesture service.

Update: Default to true

Change-Id: I0325b0a9aa6eb943b48483aebe151726a2c64ac4
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_strings.xml

Change-Id: Iadfa4ee9cf3142dcc20a3ea97c258519caf26a70
Merge branch 'sgt7/cm-11.0'