Merge pull request #3 from CyanogenMod/cm-12.0

1