Merge branch 'cm-11.0' of CyanogenMod/android_device_htc_msm8960-common into cm-11.0

if merges with cyanogenmod works correctly, it works fine evita!