Merge pull request #1 from AOKP/kitkat

Updates