Merge local
Merge branch 'cm-11.0' of https://github.com/rogersb11/philz_touch_cwm6 into cm-11.0