Merge pull request #12 from CyanogenMod/cm-11.0

Update to upstream
Merge pull request #6 from XperiaSTE/cm-11.0

Merge pull request #12 from CyanogenMod/cm-11.0