Merge branch 'cm-11.0' into stable/cm-11.0
Merge pull request #8 from CyanogenMod/stable/cm-11.0

Merge branch 'cm-11.0' into stable/cm-11.0