Merge pull request #1 from CyanogenMod/cm-12.0

Update