Merge branch 'cm-11.0' of http://github.com/PhilZ-cwm6/philz_touch_cwm6 into patched