merge cyanogenmod 10.2